]>
Commit | Line | Data |
---|---|---|
6e22eebf ER |
1 | --- mysql-5.1.28-rc/client/mysql_upgrade.c~ 2008-09-14 23:53:11.000000000 +0300 |
2 | +++ mysql-5.1.28-rc/client/mysql_upgrade.c 2008-09-15 00:02:34.047520349 +0300 | |
c4ee5d6d ER |
3 | @@ -31,12 +31,12 @@ |
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"; | |
7d614874 | 11 | |
3f8fcf96 ER |
12 | static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag; |
13 | static uint my_end_arg= 0; | |
9d55d93e ER |
14 | -static char *opt_user= (char*)"root"; |
15 | +static char *opt_user= (char*)"mysql"; | |
16 | ||
17 | static DYNAMIC_STRING ds_args; | |
b3be5f11 | 18 | |
6e22eebf | 19 | @@ -761,12 +761,6 @@ |
c4ee5d6d ER |
20 | dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS); |
21 | dynstr_append(&ds_args, " "); | |
22 | ||
23 | - /* Find mysql */ | |
6e22eebf | 24 | - find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name); |
c4ee5d6d ER |
25 | - |
26 | - /* Find mysqlcheck */ | |
6e22eebf | 27 | - find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name); |
c4ee5d6d ER |
28 | - |
29 | /* | |
30 | Read the mysql_upgrade_info file to check if mysql_upgrade | |
31 | already has been run for this installation of MySQL |