]>
Commit | Line | Data |
---|---|---|
bbae9ea7 AM |
1 | --- mysql-5.5.8/client/mysql_upgrade.c~ 2010-12-03 18:58:26.000000000 +0100 |
2 | +++ mysql-5.5.8/client/mysql_upgrade.c 2010-12-15 23:06:17.178431694 +0100 | |
3 | @@ -33,13 +33,13 @@ | |
f11bce9d ER |
4 | # endif |
5 | #endif | |
6 | ||
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"; | |
11 | ||
bbae9ea7 AM |
12 | static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag, |
13 | opt_systables_only; | |
f11bce9d ER |
14 | static uint my_end_arg= 0; |
15 | -static char *opt_user= (char*)"root"; | |
16 | +static char *opt_user= (char*)"mysql"; | |
17 | ||
18 | static DYNAMIC_STRING ds_args; | |
bbae9ea7 AM |
19 | static DYNAMIC_STRING conn_args; |
20 | @@ -848,15 +848,7 @@ | |
f11bce9d ER |
21 | dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS); |
22 | dynstr_append(&ds_args, " "); | |
23 | ||
24 | - /* Find mysql */ | |
25 | - find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name); | |
26 | - | |
bbae9ea7 AM |
27 | - if (!opt_systables_only) |
28 | - { | |
29 | - /* Find mysqlcheck */ | |
30 | - find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name); | |
31 | - } | |
32 | - else | |
33 | + if (opt_systables_only) | |
34 | { | |
35 | printf("The --upgrade-system-tables option was used, databases won't be touched.\n"); | |
36 | } |