From 3d3e2e9598f7cbae609f838b50265957748933fe Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 18 Apr 2013 15:17:27 +0200
Subject: MySQL 5.5.31

---
 mysql-plugin-test.patch | 12 ++++++------
 mysql55.spec            |  6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

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/mysql55.spec b/mysql55.spec
index 9d49220..2d087c2 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name: mysql
-Version: 5.5.30
+Version: 5.5.31
 Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
@@ -830,6 +830,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Feb 29 2013 Remi Collet <RPMS@FamilleCollet.com> - 5.5.31-1
+- update to MySQL 5.5.31 Community Server GA
+  http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-31.html
+
 * Tue Feb 12 2013 Honza Horak <hhorak@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
-- 
cgit