- don't mark db error messages files with lang as these depend on db client settings...

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

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
index 9a874d41fceb99c2386628d54bd60bbf9f431fa2..397747cccf11b6c7f8870291cd5806c94f625dec 100644 (file)
--- a/mysql-upgrade.patch
+++ b/mysql-upgrade.patch
@@ -1,20 +1,36 @@
---- mysql-5.1.14-beta/client/mysql_upgrade.c   2006-12-13 12:10:17.331321518 +0200
-+++ mysql-5.1.17-beta/client/mysql_upgrade.c   2007-04-24 22:17:48.406948376 +0300
-@@ -40,7 +40,7 @@
- extern TYPELIB sql_protocol_typelib;
+--- 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= 0, opt_verbose= 0, opt_compress= 0;
--static char *user= (char*) "root", *basedir= 0, *datadir= 0, *opt_password= 0;
-+static char *user= (char*) "mysql", *basedir= 0, *datadir= 0, *opt_password= 0;
- static char *current_host= 0;
- static char *opt_default_charset= 0, *opt_charsets_dir= 0;
- #ifdef HAVE_SMEM
-@@ -563,7 +563,7 @@
+-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";
  
-   /* Find mysqlcheck */
-   if (find_file(mysqlcheck_name, basedir, MYF(0), path, sizeof(path),
--                "bin", EXTRA_CLIENT_PATHS, NullS))
-+                "sbin", EXTRA_CLIENT_PATHS, NullS))
+ 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)
    {
-      ret= 1;
-      fprintf(stderr,
+     printf("The --upgrade-system-tables option was used, databases won't be touched.\n");
+   }