1 --- mysql-5.1.11-beta/client/mysql_upgrade.c~ 2006-06-02 21:01:24.000000000 +0300
2 +++ mysql-5.1.11-beta/client/mysql_upgrade.c 2006-11-01 20:39:36.489202516 +0200
6 static my_bool opt_force= 0, opt_verbose= 0, tty_password= 0;
7 -static char *user= (char*) "root", *basedir= 0, *datadir= 0, *opt_password= 0;
8 +static char *user= (char*) "mysql", *basedir= (char *)"/usr", *datadir= 0, *opt_password= 0;
9 static my_bool upgrade_defaults_created= 0;
10 static my_string opt_mysql_port, opt_mysql_unix_port= 0;
11 static char *default_dbug_option= (char*) "d:t:O,/tmp/comp_err.trace";