compat-mysql55: try to update to 5.5.34, but don't build, need investigation

6 files changed, 53 insertions, 64 deletions

diff --git a/compat-mysql55.spec b/compat-mysql55.spec
index 679e8e5..2dc2bb3 100644
--- a/compat-mysql55.spec
+++ b/compat-mysql55.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name: compat-mysql55
-Version: 5.5.30
+Version: 5.5.34
 Release: 1%{?dist}
 Summary: MySQL shared libraries
 Group: Applications/Databases
@@ -44,6 +44,9 @@ Patch18: mysql-cipherspec.patch
 Patch19: mysql-file-contents.patch
 Patch20: mysql-string-overflow.patch
 Patch21: mysql-dh1024.patch
+Patch22: mysql-innodbwarn.patch
+# http://bugs.mysql.com/68999
+Patch23: mysql-openssl.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -95,6 +98,8 @@ rm -f Docs/mysql.info
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 # upstream has fallen down badly on symbol versioning, do it ourselves
 cp %{SOURCE8} libmysql/libmysql.version
@@ -129,14 +134,18 @@ cmake . -DBUILD_CONFIG=mysql_release \
 	-DINSTALL_LIBDIR="%{_lib}/mysql" \
 	-DINSTALL_MANDIR=share/man \
 	-DINSTALL_MYSQLSHAREDIR=share/mysql \
+	-DINSTALL_MYSQLTESTDIR=share/mysql-test \
+	-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
 	-DINSTALL_SBINDIR=libexec \
+	-DINSTALL_SCRIPTDIR=bin \
+	-DINSTALL_SQLBENCHDIR=share \
 	-DINSTALL_SUPPORTFILESDIR=share/mysql \
+	-DMYSQL_DATADIR="/var/lib/mysql" \
 	-DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
 	-DENABLED_LOCAL_INFILE=ON \
 %if %{with_dtrace}
 	-DENABLE_DTRACE=ON \
 %endif
-	-DWITH_EMBEDDED_SERVER=ON \
 	-DWITH_READLINE=ON \
 	-DWITH_SSL=system \
 	-DWITH_ZLIB=system
@@ -213,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 12 2013 Remi Collet <RPMS@FamilleCollet.com> - 5.5.34-1
+- update to 5.5.34
+
 * Mon Feb 11 2013 Remi Collet <RPMS@FamilleCollet.com> - 5.5.30-1
 - update to 5.5.30
 
diff --git a/mysql-disable-test.patch b/mysql-disable-test.patch
deleted file mode 100644
index 48020b8..0000000
--- a/mysql-disable-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Disable the outfile_loaddata test, which as of 5.1.38 is giving
-platform-dependent results, with the "expected" results being arguably the
-wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
-(note that upstream has also disabled it, but only for Solaris, so we still
-need this patch).
-
-Also disable sys_vars.plugin_dir_basic, which is broken because
-mysql-test-run doesn't set the right value of MYSQL_LIBDIR.  Upstream at
-http://bugs.mysql.com/bug.php?id=52223
-
-Also disable perfschema.binlog_mix and perfschema.binlog_row, which have
-expected output that doesn't match when openssl is in use.  Upstream at
-http://bugs.mysql.com/bug.php?id=59091
-
-Also disable gis, which expects the results of floating-point calculations
-to match to seventeen digits precision everywhere.  Of course they won't.
-Upstream at http://bugs.mysql.com/bug.php?id=59908
-
-Also disable innodb.innodb, which is showing platform-dependent results
-as of 5.5.9.  Upstream at http://bugs.mysql.com/bug.php?id=60155
-
-
-diff -Naur mysql-5.5.9.orig/mysql-test/t/disabled.def mysql-5.5.9/mysql-test/t/disabled.def
---- mysql-5.5.9.orig/mysql-test/t/disabled.def	2011-01-19 17:37:09.000000000 -0500
-+++ mysql-5.5.9/mysql-test/t/disabled.def	2011-02-16 23:19:34.844378338 -0500
-@@ -18,3 +18,10 @@
- sum_distinct-big         : Bug#56927 2010-11-15 mattiasj was not tested
- alter_table-big          : Bug#37248 2010-11-15 mattiasj was not tested
- create-big               : Bug#37248 2010-11-15 mattiasj was not tested
-+#
-+outfile_loaddata         : bug#46895 code wrong, expected results wrong too
-+sys_vars.plugin_dir_basic : bug#52223 fails for lib64 library directory
-+perfschema.binlog_mix    : bug#59091 fails with openssl
-+perfschema.binlog_row    : bug#59091 fails with openssl
-+gis                      : bug#59908 has platform-dependent results
-+innodb.innodb            : bug#60155 has platform-dependent results
diff --git a/mysql-innodbwarn.patch b/mysql-innodbwarn.patch
new file mode 100644
index 0000000..c513442
--- /dev/null
+++ b/mysql-innodbwarn.patch
@@ -0,0 +1,20 @@
+Test case rpl.rpl_daedlock_innodb fails when dropping tables because some
+warnings are generated in the slave server. The test is working fine when
+running alone, but fails when all tests are running, so it seems not to be
+so bad thing to ignore that warnings.
+
+http://bugs.mysql.com/bug.php?id=69458
+
+diff -up mysql-5.5.32/mysql-test/include/mtr_warnings.sql.innodbwarn mysql-5.5.32/mysql-test/include/mtr_warnings.sql
+--- mysql-5.5.32/mysql-test/include/mtr_warnings.sql.innodbwarn	2013-06-13 16:45:27.723525133 +0200
++++ mysql-5.5.32/mysql-test/include/mtr_warnings.sql	2013-06-13 16:46:24.879524133 +0200
+@@ -162,6 +162,9 @@ INSERT INTO global_suppressions VALUES
+  ("InnoDB: Error: in RENAME TABLE table `test`.`t1`"),
+  ("InnoDB: Error: table `test`.`t[123]` does not exist in the InnoDB internal"),
+ 
++ /* rpl.rpl_deadlock_innodb fails when trying DROP tables */
++ ("InnoDB: Error: table `mysqld.2`.`#sql.*` does not exist in the InnoDB internal"),
++
+  /*
+    BUG#32080 - Excessive warnings on Solaris: setrlimit could not
+    change the size of core files
diff --git a/mysql-openssl.patch b/mysql-openssl.patch
new file mode 100644
index 0000000..bcdc1d2
--- /dev/null
+++ b/mysql-openssl.patch
@@ -0,0 +1,13 @@
+--- mysql-5.5.31/vio/viossl.c~	2013-03-25 14:14:58.000000000 +0100
++++ mysql-5.5.31/vio/viossl.c	2013-04-18 16:58:38.552557538 +0200
+@@ -172,8 +172,10 @@
+   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
+   SSL_set_fd(ssl, vio->sd);
+ #ifndef HAVE_YASSL
++#ifdef SSL_OP_NO_COMPRESSION
+   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
+ #endif
++#endif
+ 
+   if ((r= connect_accept_func(ssl)) < 1)
+   {
diff --git a/mysql-plugin-test.patch b/mysql-plugin-test.patch
index 5d08c32..10cc791 100644
--- a/mysql-plugin-test.patch
+++ b/mysql-plugin-test.patch
@@ -12,9 +12,9 @@ diff -up mysql-5.5.21/mysql-test/t/mysql_plugin-master.opt.plugin mysql-5.5.21/m
 @@ -1 +1 @@
 ---plugin-dir=$DAEMONEXAMPLE_DIR
 +--plugin-dir=$MYSQLTEST_VARDIR/plugin
-diff -up mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.21/mysql-test/t/mysql_plugin.test
---- mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin	2012-01-31 12:28:15.000000000 +0100
-+++ mysql-5.5.21/mysql-test/t/mysql_plugin.test	2012-03-14 17:11:40.769295981 +0100
+diff -up mysql-5.5.31/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.31/mysql-test/t/mysql_plugin.test
+--- mysql-5.5.31/mysql-test/t/mysql_plugin.test.test	2013-03-25 14:14:58.000000000 +0100
++++ mysql-5.5.31/mysql-test/t/mysql_plugin.test	2013-04-18 14:43:15.747052348 +0200
 @@ -25,8 +25,10 @@
  # Add the datadir, basedir, plugin_dir to the bootstrap command
  let $MYSQLD_DATADIR= `select @@datadir`;
@@ -70,7 +70,7 @@ diff -up mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.21/mysql-t
  
  --echo #
  --echo # Ensure the plugin isn't loaded.
-@@ -202,7 +209,7 @@ EOF
+@@ -184,7 +191,7 @@ SELECT * FROM mysql.plugin WHERE dl like
  # we must copy the example daemon to a new location renaming it.
  
  let $DAEMON_RELOAD = lib$DAEMONEXAMPLE;
@@ -79,8 +79,8 @@ diff -up mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.21/mysql-t
  --copy_file include/libdaemon_example.ini $PLUGIN_DIR/libdaemon_example.ini
  
  # Now reload it and see that it is a different name.
-@@ -395,8 +402,11 @@ EOF
- --remove_file $expect_file
+@@ -361,8 +368,11 @@ replace_result $MYSQL_PLUGIN mysql_plugi
+ --remove_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
  
  # Cleanup the share folder in the binary path.
 ---remove_file $MYSQLD_BASEDIR/share/errmsg.sys
diff --git a/mysql-readline.patch b/mysql-readline.patch
deleted file mode 100644
index 9636913..0000000
--- a/mysql-readline.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mysql-5.5.8/cmake/readline.cmake.readline	2010-12-03 18:58:26.000000000 +0100
-+++ mysql-5.5.8/cmake/readline.cmake	2010-12-22 23:11:19.641789020 +0100
-@@ -139,7 +139,7 @@
- 
-   IF(${name}_LIBRARY AND ${name}_INCLUDE_DIR)
-     SET(SYSTEM_READLINE_FOUND 1)
--    SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY})
-+    SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY} ncurses)
-     CHECK_CXX_SOURCE_COMPILES("
-     #include <stdio.h>
-     #include <readline/readline.h>
-@@ -172,7 +172,7 @@
-     ${name}_USE_NEW_READLINE_INTERFACE)
-     
-     IF(${name}_USE_LIBEDIT_INTERFACE  OR ${name}_USE_NEW_READLINE_INTERFACE)
--      SET(READLINE_LIBRARY ${${name}_LIBRARY})
-+      SET(READLINE_LIBRARY ${${name}_LIBRARY} ncurses)
-       SET(READLINE_INCLUDE_DIR ${${name}_INCLUDE_DIR})
-       SET(HAVE_HIST_ENTRY ${${name}_HAVE_HIST_ENTRY})
-       SET(USE_LIBEDIT_INTERFACE ${${name}_USE_LIBEDIT_INTERFACE})