- updated to 5.5.32

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
index 49f5369ddb6b928c7a9b4d8a4b2c47ca148b145c..397747cccf11b6c7f8870291cd5806c94f625dec 100644 (file)
--- a/mysql-upgrade.patch
+++ b/mysql-upgrade.patch
@@ -1,6 +1,6 @@
---- mysql-5.5.8/client/mysql_upgrade.c~        2010-12-03 18:58:26.000000000 +0100
-+++ mysql-5.5.8/client/mysql_upgrade.c 2010-12-15 23:06:17.178431694 +0100
-@@ -33,13 +33,13 @@
+--- mysql-5.5.32/client/mysql_upgrade.c.orig   2013-07-01 03:16:34.000000000 +0000
++++ mysql-5.5.32/client/mysql_upgrade.c        2013-07-09 16:15:08.366178596 +0000
+@@ -35,13 +35,13 @@
  # endif
  #endif
  
@@ -10,14 +10,14 @@
 +static char *mysqlcheck_path = "/usr/sbin/mysqlcheck";
  
  static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
-                opt_systables_only;
+                opt_systables_only, opt_version_check;
  static uint my_end_arg= 0;
 -static char *opt_user= (char*)"root";
 +static char *opt_user= (char*)"mysql";
  
  static DYNAMIC_STRING ds_args;
  static DYNAMIC_STRING conn_args;
-@@ -848,15 +848,7 @@
+@@ -923,15 +923,7 @@
    dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS);
    dynstr_append(&ds_args, " ");
  

diff --git a/mysql.spec b/mysql.spec
index d32bdfcedcacc3495872da2f378612d0f5345b76..632769c508cb291990742481fda96b9e34eb829f 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,7 +23,7 @@
 %bcond_with    tests           # FIXME: don't run correctly
 %bcond_with    ndb             # NDB is now a separate product, this here is broken, so disable it
 
-%define        percona_rel     30.3
+%define        percona_rel     31.0
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     MySQL: ist eine SQL-Datenbank
@@ -34,14 +34,14 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.5.31
-Release:       2
+Version:       5.5.32
+Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
 # Source0:     http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
 Source0:       http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-%{version}-rel%{percona_rel}.tar.gz
-# Source0-md5: 702f4869b97cec5de8531954291a6b74
+# Source0-md5: aafbc2a94353d68b5cbfbeddb7eb2e08
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.0.8-release.tar.gz
 # Source100-md5:       bcaf0af0ba403a43b9ef3af6f9599cb4
 Source1:       %{name}.init