- rel 2; patches updated

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

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
index 404dd19e777fec7bc0e750a93c35e571743b1ad0..49f5369ddb6b928c7a9b4d8a4b2c47ca148b145c 100644 (file)
--- a/mysql-upgrade.patch
+++ b/mysql-upgrade.patch
@@ -1,11 +1,36 @@
---- mysql-5.1.11-beta/client/mysql_upgrade.c~  2006-06-02 21:01:24.000000000 +0300
-+++ mysql-5.1.11-beta/client/mysql_upgrade.c   2006-11-01 20:39:36.489202516 +0200
-@@ -18,7 +18,7 @@
- #include <my_dir.h>
- 
- static my_bool opt_force= 0, opt_verbose= 0, tty_password= 0;
--static char *user= (char*) "root", *basedir= 0, *datadir= 0, *opt_password= 0;
-+static char *user= (char*) "mysql", *basedir= (char *)"/usr", *datadir= 0, *opt_password= 0;
- static my_bool upgrade_defaults_created= 0;
- static my_string opt_mysql_port, opt_mysql_unix_port= 0;
- static char *default_dbug_option= (char*) "d:t:O,/tmp/comp_err.trace";
+--- 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 @@
+ # 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;
+ 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 @@
+   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");
+   }