Update to MySQL 5.5.31
This commit is contained in:
parent
849395bef6
commit
bcfa13df01
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/mysql-5.5.30-nodocs.tar.gz
|
/mysql-5.5.30-nodocs.tar.gz
|
||||||
|
/mysql-5.5.31-nodocs.tar.gz
|
||||||
|
@ -6,15 +6,15 @@ read-only-to-us plugin directory.
|
|||||||
rhbz #789530, upstream at http://bugs.mysql.com/bug.php?id=62907
|
rhbz #789530, upstream at http://bugs.mysql.com/bug.php?id=62907
|
||||||
|
|
||||||
|
|
||||||
diff -up mysql-5.5.21/mysql-test/t/mysql_plugin-master.opt.plugin mysql-5.5.21/mysql-test/t/mysql_plugin-master.opt
|
diff -up mysql-5.5.31/mysql-test/t/mysql_plugin-master.opt.p17 mysql-5.5.31/mysql-test/t/mysql_plugin-master.opt
|
||||||
--- mysql-5.5.21/mysql-test/t/mysql_plugin-master.opt.plugin 2012-01-31 12:28:15.000000000 +0100
|
--- mysql-5.5.31/mysql-test/t/mysql_plugin-master.opt.p17 2013-03-25 14:14:58.000000000 +0100
|
||||||
+++ mysql-5.5.21/mysql-test/t/mysql_plugin-master.opt 2012-03-14 16:54:19.060951822 +0100
|
+++ mysql-5.5.31/mysql-test/t/mysql_plugin-master.opt 2013-04-19 13:38:23.761741532 +0200
|
||||||
@@ -1 +1 @@
|
@@ -1 +1 @@
|
||||||
---plugin-dir=$DAEMONEXAMPLE_DIR
|
---plugin-dir=$DAEMONEXAMPLE_DIR
|
||||||
+--plugin-dir=$MYSQLTEST_VARDIR/plugin
|
+--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
|
diff -up mysql-5.5.31/mysql-test/t/mysql_plugin.test.p17 mysql-5.5.31/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.31/mysql-test/t/mysql_plugin.test.p17 2013-03-25 14:14:58.000000000 +0100
|
||||||
+++ mysql-5.5.21/mysql-test/t/mysql_plugin.test 2012-03-14 17:11:40.769295981 +0100
|
+++ mysql-5.5.31/mysql-test/t/mysql_plugin.test 2013-04-19 13:38:25.606742145 +0200
|
||||||
@@ -25,8 +25,10 @@
|
@@ -25,8 +25,10 @@
|
||||||
# Add the datadir, basedir, plugin_dir to the bootstrap command
|
# Add the datadir, basedir, plugin_dir to the bootstrap command
|
||||||
let $MYSQLD_DATADIR= `select @@datadir`;
|
let $MYSQLD_DATADIR= `select @@datadir`;
|
||||||
@ -51,10 +51,10 @@ diff -up mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.21/mysql-t
|
|||||||
---copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
|
---copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_BASEDIR/share/errmsg.sys
|
||||||
---copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_BASEDIR/share/mysql/errmsg.sys
|
---copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_BASEDIR/share/mysql/errmsg.sys
|
||||||
+--mkdir $MYSQLD_TMP_BASEDIR/share
|
+--mkdir $MYSQLD_TMP_BASEDIR/share
|
||||||
+--mkdir $MYSQLD_TMP_BASEDIR/share/community-mysql
|
+--mkdir $MYSQLD_TMP_BASEDIR/share/mysql
|
||||||
+--mkdir $PLUGIN_DIR
|
+--mkdir $PLUGIN_DIR
|
||||||
+--copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_TMP_BASEDIR/share/errmsg.sys
|
+--copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_TMP_BASEDIR/share/errmsg.sys
|
||||||
+--copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_TMP_BASEDIR/share/community-mysql/errmsg.sys
|
+--copy_file $MYSQL_ERRMSG_BASEDIR/english/errmsg.sys $MYSQLD_TMP_BASEDIR/share/mysql/errmsg.sys
|
||||||
+--copy_file $PLUGIN_BASEDIR/libdaemon_example.so $PLUGIN_DIR/libdaemon_example.so
|
+--copy_file $PLUGIN_BASEDIR/libdaemon_example.so $PLUGIN_DIR/libdaemon_example.so
|
||||||
+--copy_file $PLUGIN_BASEDIR/daemon_example.ini $PLUGIN_DIR/daemon_example.ini
|
+--copy_file $PLUGIN_BASEDIR/daemon_example.ini $PLUGIN_DIR/daemon_example.ini
|
||||||
+
|
+
|
||||||
@ -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 #
|
||||||
--echo # Ensure the plugin isn't loaded.
|
--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.
|
# we must copy the example daemon to a new location renaming it.
|
||||||
|
|
||||||
let $DAEMON_RELOAD = lib$DAEMONEXAMPLE;
|
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
|
--copy_file include/libdaemon_example.ini $PLUGIN_DIR/libdaemon_example.ini
|
||||||
|
|
||||||
# Now reload it and see that it is a different name.
|
# Now reload it and see that it is a different name.
|
||||||
@@ -395,8 +402,11 @@ EOF
|
@@ -361,8 +368,11 @@ replace_result $MYSQL_PLUGIN mysql_plugi
|
||||||
--remove_file $expect_file
|
--remove_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
||||||
|
|
||||||
# Cleanup the share folder in the binary path.
|
# Cleanup the share folder in the binary path.
|
||||||
---remove_file $MYSQLD_BASEDIR/share/errmsg.sys
|
---remove_file $MYSQLD_BASEDIR/share/errmsg.sys
|
||||||
@ -90,7 +90,7 @@ diff -up mysql-5.5.21/mysql-test/t/mysql_plugin.test.plugin mysql-5.5.21/mysql-t
|
|||||||
+--remove_file $PLUGIN_DIR/libdaemon_example.so
|
+--remove_file $PLUGIN_DIR/libdaemon_example.so
|
||||||
+--rmdir $PLUGIN_DIR
|
+--rmdir $PLUGIN_DIR
|
||||||
+--remove_file $MYSQLD_TMP_BASEDIR/share/errmsg.sys
|
+--remove_file $MYSQLD_TMP_BASEDIR/share/errmsg.sys
|
||||||
+--rmdir $MYSQLD_TMP_BASEDIR/share/community-mysql
|
+--rmdir $MYSQLD_TMP_BASEDIR/share/mysql
|
||||||
+--rmdir $MYSQLD_TMP_BASEDIR/share
|
+--rmdir $MYSQLD_TMP_BASEDIR/share
|
||||||
|
|
||||||
--enable_abort_on_error
|
--enable_abort_on_error
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: community-mysql
|
Name: community-mysql
|
||||||
Version: 5.5.30
|
Version: 5.5.31
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: MySQL client programs and shared libraries
|
Summary: MySQL client programs and shared libraries
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
@ -696,6 +696,10 @@ install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/my
|
|||||||
%{_mandir}/man1/mysql_client_test.1*
|
%{_mandir}/man1/mysql_client_test.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 19 2013 Honza Horak <hhorak@redhat.com> 5.5.31-1
|
||||||
|
- Update to MySQL 5.5.31, for various fixes described at
|
||||||
|
http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-31.html
|
||||||
|
|
||||||
* Wed Mar 20 2013 Honza Horak <hhorak@redhat.com> 5.5.30-5
|
* Wed Mar 20 2013 Honza Horak <hhorak@redhat.com> 5.5.30-5
|
||||||
- Renaming package MySQL to community-mysql to handle issues
|
- Renaming package MySQL to community-mysql to handle issues
|
||||||
introduced by case-insensitive operations of yum and for proper
|
introduced by case-insensitive operations of yum and for proper
|
||||||
|
Loading…
Reference in New Issue
Block a user