- rel 3

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

--- 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 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");
   }