From 5832d001818caa473ee629078ee41c87936ff69b Mon Sep 17 00:00:00 2001 From: Jan Staněk Date: Aug 05 2014 10:10:59 +0000 Subject: Update to MySQL 5.5.39, for various fixes described at http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-39.html --- diff --git a/.gitignore b/.gitignore index 1824b0b..a50b898 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /mysql-5.5.36.tar.gz /mysql-5.5.37.tar.gz /mysql-5.5.38.tar.gz +/mysql-5.5.39.tar.gz diff --git a/community-mysql-man-pages.patch b/community-mysql-man-pages.patch index e172797..16dc3f7 100644 --- a/community-mysql-man-pages.patch +++ b/community-mysql-man-pages.patch @@ -108,7 +108,7 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1 .\" mysql: named-commands option .\" named-commands option: mysql \fB\-\-named\-commands\fR, -@@ -650,13 +727,28 @@ the section called \(lqMYSQL COMMANDS\(r +@@ -650,6 +727,21 @@ the section called \(lqMYSQL COMMANDS\(r .sp -1 .IP \(bu 2.3 .\} @@ -130,14 +130,6 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1 .\" mysql: no-auto-rehash option .\" no-auto-rehash option: mysql \fB\-\-no\-auto\-rehash\fR, - \fB\-A\fR - .sp - This has the same effect as --\fB\-skip\-auto\-rehash\fR\&. See the description for -+\fB\-\-skip\-auto\-rehash\fR\&. See the description for - \fB\-\-auto\-rehash\fR\&. - .RE - .sp @@ -684,6 +776,21 @@ Do not beep when errors occur\&. .sp -1 .IP \(bu 2.3 @@ -279,7 +271,6 @@ diff -up mysql-5.5.37/man/mysql.1.p24 mysql-5.5.37/man/mysql.1 .fi .if n \{\ .RE -diff -up mysql-5.5.37/man/mysqladmin.1.p24 mysql-5.5.37/man/mysqladmin.1 --- mysql-5.5.37/man/mysqladmin.1.p24 2014-03-14 19:58:40.000000000 +0100 +++ mysql-5.5.37/man/mysqladmin.1 2014-04-17 16:48:47.167301353 +0200 @@ -689,6 +689,21 @@ Compress all information sent between th @@ -408,7 +399,6 @@ diff -up mysql-5.5.37/man/mysqladmin.1.p24 mysql-5.5.37/man/mysqladmin.1 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} -diff -up mysql-5.5.37/man/mysqlbinlog.1.p24 mysql-5.5.37/man/mysqlbinlog.1 --- mysql-5.5.37/man/mysqlbinlog.1.p24 2014-03-14 19:58:40.000000000 +0100 +++ mysql-5.5.37/man/mysqlbinlog.1 2014-04-17 16:48:47.168301353 +0200 @@ -599,6 +599,7 @@ privilege\&. @@ -442,7 +432,6 @@ diff -up mysql-5.5.37/man/mysqlbinlog.1.p24 mysql-5.5.37/man/mysqlbinlog.1 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} -diff -up mysql-5.5.37/man/mysqlcheck.1.p24 mysql-5.5.37/man/mysqlcheck.1 --- mysql-5.5.37/man/mysqlcheck.1.p24 2014-03-14 19:58:40.000000000 +0100 +++ mysql-5.5.37/man/mysqlcheck.1 2014-04-17 16:48:47.169301353 +0200 @@ -490,6 +490,38 @@ Section\ \&10.5, \(lqCharacter Set Confi @@ -529,7 +518,6 @@ diff -up mysql-5.5.37/man/mysqlcheck.1.p24 mysql-5.5.37/man/mysqlcheck.1 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} -diff -up mysql-5.5.37/man/mysql_config.1.p24 mysql-5.5.37/man/mysql_config.1 --- mysql-5.5.37/man/mysql_config.1.p24 2014-03-14 19:58:40.000000000 +0100 +++ mysql-5.5.37/man/mysql_config.1 2014-04-17 16:48:47.168301353 +0200 @@ -178,6 +178,22 @@ The default Unix socket file, defined wh @@ -555,7 +543,6 @@ diff -up mysql-5.5.37/man/mysql_config.1.p24 mysql-5.5.37/man/mysql_config.1 .\" mysql_config: version option .\" version option: mysql_config \fB\-\-version\fR -diff -up mysql-5.5.37/man/mysqldump.1.p24 mysql-5.5.37/man/mysqldump.1 --- mysql-5.5.37/man/mysqldump.1.p24 2014-03-14 19:58:40.000000000 +0100 +++ mysql-5.5.37/man/mysqldump.1 2014-04-17 16:48:47.168301353 +0200 @@ -693,7 +693,8 @@ Compress all information sent between th @@ -688,7 +675,6 @@ diff -up mysql-5.5.37/man/mysqldump.1.p24 mysql-5.5.37/man/mysqldump.1 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} -diff -up mysql-5.5.37/man/mysqlimport.1.p24 mysql-5.5.37/man/mysqlimport.1 --- mysql-5.5.37/man/mysqlimport.1.p24 2014-03-14 19:58:40.000000000 +0100 +++ mysql-5.5.37/man/mysqlimport.1 2014-04-17 16:48:47.169301353 +0200 @@ -260,10 +260,42 @@ This option was added in MySQL 5\&.5\&.1 @@ -781,7 +767,6 @@ diff -up mysql-5.5.37/man/mysqlimport.1.p24 mysql-5.5.37/man/mysqlimport.1 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} -diff -up mysql-5.5.37/man/mysqlshow.1.p24 mysql-5.5.37/man/mysqlshow.1 --- mysql-5.5.37/man/mysqlshow.1.p24 2014-03-14 19:58:40.000000000 +0100 +++ mysql-5.5.37/man/mysqlshow.1 2014-04-17 16:48:47.170301353 +0200 @@ -175,7 +175,8 @@ that is supplied with MySQL Cluster\&. I @@ -879,7 +864,6 @@ diff -up mysql-5.5.37/man/mysqlshow.1.p24 mysql-5.5.37/man/mysqlshow.1 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} -diff -up mysql-5.5.37/man/mysqlslap.1.p24 mysql-5.5.37/man/mysqlslap.1 --- mysql-5.5.37/man/mysqlslap.1.p24 2014-03-14 19:58:40.000000000 +0100 +++ mysql-5.5.37/man/mysqlslap.1 2014-04-17 16:48:47.170301353 +0200 @@ -526,6 +526,38 @@ This option was added in MySQL 5\&.5\&.1 diff --git a/community-mysql-pluginerrmsg.patch b/community-mysql-pluginerrmsg.patch index 9e4461d..2fd2de2 100644 --- a/community-mysql-pluginerrmsg.patch +++ b/community-mysql-pluginerrmsg.patch @@ -23,19 +23,20 @@ diff -up mysql-5.5.33/include/mysql.h.p30 mysql-5.5.33/include/mysql.h typedef struct st_mysql_rows { struct st_mysql_rows *next; /* list of rows */ -diff -up mysql-5.5.33/mysql-test/r/plugin.result.p30 mysql-5.5.33/mysql-test/r/plugin.result --- mysql-5.5.33/mysql-test/r/plugin.result.p30 2013-07-15 14:01:49.000000000 +0200 +++ mysql-5.5.33/mysql-test/r/plugin.result 2013-08-20 17:26:56.746334059 +0200 -@@ -143,3 +143,5 @@ SELECT @@SESSION.example_double_thdvar; +@@ -143,6 +143,8 @@ SELECT @@SESSION.example_double_thdvar; @@SESSION.example_double_thdvar 1000.500000 UNINSTALL PLUGIN example; +UNINSTALL PLUGIN MyISAM; +ERROR HY000: Built-in plugins cannot be deleted -diff -up mysql-5.5.33/mysql-test/t/plugin.test.p30 mysql-5.5.33/mysql-test/t/plugin.test + # + # BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN + # --- mysql-5.5.33/mysql-test/t/plugin.test.p30 2013-07-15 14:01:49.000000000 +0200 +++ mysql-5.5.33/mysql-test/t/plugin.test 2013-08-20 17:26:56.746334059 +0200 -@@ -137,3 +137,10 @@ SET SESSION example_double_thdvar = 1000 +@@ -137,6 +137,13 @@ SET SESSION example_double_thdvar = 1000 SELECT @@SESSION.example_double_thdvar; UNINSTALL PLUGIN example; @@ -46,7 +47,9 @@ diff -up mysql-5.5.33/mysql-test/t/plugin.test.p30 mysql-5.5.33/mysql-test/t/plu +--error ER_PLUGIN_DELETE_BUILTIN +UNINSTALL PLUGIN MyISAM; + -diff -up mysql-5.5.33/sql/share/errmsg-utf8.txt.p30 mysql-5.5.33/sql/share/errmsg-utf8.txt + + --echo # + --echo # BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN --- mysql-5.5.33/sql/share/errmsg-utf8.txt.p30 2013-07-15 14:01:50.000000000 +0200 +++ mysql-5.5.33/sql/share/errmsg-utf8.txt 2013-08-20 17:26:56.750334057 +0200 @@ -6161,7 +6161,7 @@ WARN_NO_MASTER_INFO @@ -58,7 +61,6 @@ diff -up mysql-5.5.33/sql/share/errmsg-utf8.txt.p30 mysql-5.5.33/sql/share/errms eng "Built-in plugins cannot be deleted" ger "Eingebaute Plugins können nicht gelöscht werden" WARN_PLUGIN_BUSY -diff -up mysql-5.5.33/sql/sql_plugin.cc.p30 mysql-5.5.33/sql/sql_plugin.cc --- mysql-5.5.33/sql/sql_plugin.cc.p30 2013-08-20 17:26:56.640334104 +0200 +++ mysql-5.5.33/sql/sql_plugin.cc 2013-08-20 17:26:56.752334057 +0200 @@ -1909,9 +1909,7 @@ bool mysql_uninstall_plugin(THD *thd, co diff --git a/community-mysql.spec b/community-mysql.spec index ba03e59..b5f98f2 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -4,8 +4,8 @@ %global ship_my_cnf 0 Name: community-mysql -Version: 5.5.38 -Release: 3%{?dist} +Version: 5.5.39 +Release: 1%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases @@ -337,7 +337,7 @@ ar -x ../libmysqld.a # these result in missing dependencies: (filed upstream as bug 59104) rm -f sql_binlog.cc.o rpl_utility.cc.o gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 \ - *.o ../../probes_mysql.o \ + *.o \ -lpthread -laio -lcrypt -lssl -lcrypto -lz -lrt -lstdc++ -ldl -lm -lc # this is to check that we built a complete library cp %{SOURCE9} . @@ -734,6 +734,10 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris %{_mandir}/man1/mysql_client_test.1* %changelog +* Mon Aug 04 2014 Jan Stanek - 5.5.39-1 +- Update to MySQL 5.5.39, for various fixes described at + http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-39.html + * Fri Jun 27 2014 Honza Horak - 5.5.38-3 - Require /etc/my.cnf instead of shipping it diff --git a/sources b/sources index 6e4ef81..984184a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df5071c49764c3ad65df04ff20866a86 mysql-5.5.38.tar.gz +b6f0ba553fb1ac839921b1135cb184ae mysql-5.5.39.tar.gz