[mysql/f18] Update to MySQL 5.5.31

[Honza Horak]

commit 7988555b0d6d530ffb9960392eb997e72c5690dc
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri Apr 19 14:01:39 2013 +0200

    Update to MySQL 5.5.31

 .gitignore              |    1 +
 mysql-plugin-test.patch |   18 +++++++++---------
 mysql.spec              |    6 +++++-
 sources                 |    2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d15a15f..1862b59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mysql-5.5.29-nodocs.tar.gz
 /mysql-5.5.30-nodocs.tar.gz
+/mysql-5.5.31-nodocs.tar.gz
diff --git a/mysql-plugin-test.patch b/mysql-plugin-test.patch
index 5d08c32..a467d3c 100644
--- a/mysql-plugin-test.patch
+++ b/mysql-plugin-test.patch
@@ -6,15 +6,15 @@ read-only-to-us plugin directory.
 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
---- mysql-5.5.21/mysql-test/t/mysql_plugin-master.opt.plugin	2012-01-31 12:28:15.000000000 +0100
-+++ mysql-5.5.21/mysql-test/t/mysql_plugin-master.opt	2012-03-14 16:54:19.060951822 +0100
+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.31/mysql-test/t/mysql_plugin-master.opt.p17	2013-03-25 14:14:58.000000000 +0100
++++ mysql-5.5.31/mysql-test/t/mysql_plugin-master.opt	2013-04-19 13:38:23.761741532 +0200
 @@ -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.p17 mysql-5.5.31/mysql-test/t/mysql_plugin.test
+--- mysql-5.5.31/mysql-test/t/mysql_plugin.test.p17	2013-03-25 14:14:58.000000000 +0100
++++ mysql-5.5.31/mysql-test/t/mysql_plugin.test	2013-04-19 13:38:25.606742145 +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.spec b/mysql.spec
index a62d06b..4c6c8cb 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.5.30
+Version: 5.5.31
 Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
@@ -726,6 +726,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Apr 19 2013 Honza Horak <hhorak at 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
+
 * Tue Feb 12 2013 Honza Horak <hhorak at redhat.com> 5.5.30-1
 - Update to MySQL 5.5.30, for various fixes described at
   http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-30.html
diff --git a/sources b/sources
index bd950ed..c09c60e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-382ab22fd33ec4fb65ecd61d92b61736  mysql-5.5.30-nodocs.tar.gz
+2dd78a69ceaaf40fcbf985add94c4a2b  mysql-5.5.31-nodocs.tar.gz