1 --- mysql-5.1.22-rc/client/mysql_upgrade.c 2007-09-24 13:30:24.000000000 +0300
2 +++ mysql-5.1.22-rc-upgrade/client/mysql_upgrade.c 2008-01-12 17:28:56.945615880 +0200
7 -static char mysql_path[FN_REFLEN];
8 -static char mysqlcheck_path[FN_REFLEN];
9 +static char *mysql_path = "/usr/bin/mysql";
10 +static char *mysqlcheck_path = "/usr/sbin/mysqlcheck";
12 static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag;
13 static uint my_end_arg= 0;
14 -static char *opt_user= (char*)"root";
15 +static char *opt_user= (char*)"mysql";
17 static DYNAMIC_STRING ds_args;
20 dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS);
21 dynstr_append(&ds_args, " ");
24 - find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"));
26 - /* Find mysqlcheck */
27 - find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"));
30 Read the mysql_upgrade_info file to check if mysql_upgrade
31 already has been run for this installation of MySQL