- up to percona 5.6.15 and sphinx 2.1.4

[packages/mysql.git] / mysql-upgrade.patch

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
index 5c0c01a6711db606f3c21235c98f7b256c9114ed..397747cccf11b6c7f8870291cd5806c94f625dec 100644 (file)
--- a/mysql-upgrade.patch
+++ b/mysql-upgrade.patch
@@ -1,11 +1,36 @@
---- mysql-5.1.21-beta/client/mysql_upgrade.c~  2007-08-29 19:02:11.000000000 +0300
-+++ mysql-5.1.21-beta/client/mysql_upgrade.c   2007-08-29 22:38:46.000000000 +0300
-@@ -36,7 +36,7 @@
+--- 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
  
- static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag;
+-static char mysql_path[FN_REFLEN];
+-static char mysqlcheck_path[FN_REFLEN];
++static char *mysql_path = "/usr/bin/mysql";
++static char *mysqlcheck_path = "/usr/sbin/mysqlcheck";
+ 
+ static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
+                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;
+@@ -923,15 +923,7 @@
+   dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS);
+   dynstr_append(&ds_args, " ");
  
+-  /* Find mysql */
+-  find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name);
+-
+-  if (!opt_systables_only)
+-  {
+-    /* Find mysqlcheck */
+-    find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name);
+-  }
+-  else
++  if (opt_systables_only)
+   {
+     printf("The --upgrade-system-tables option was used, databases won't be touched.\n");
+   }