diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-20 07:20:48 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-20 07:20:48 +0200 |
| commit | 5e28fd3bd9c03dcc48b20e5b3112d287a477e4ac (patch) | |
| tree | 6c2c49f5a83ad72ef60e9a8a92f8ba1b072ec74b /client | |
| parent | b7c46548164a99d41823d6373ec2bdb3326a5041 (diff) | |
| parent | 1f6c9a58fbf1c4851008b9dd706d4fad8ee986db (diff) | |
| download | mariadb-git-5e28fd3bd9c03dcc48b20e5b3112d287a477e4ac.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
client/mysql_upgrade.c:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index d67933fa240..aeda47c48eb 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -444,7 +444,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res, ret= run_tool(mysql_path, ds_res, - ds_args.str, // MASV... quoted? + ds_args.str, "--database=mysql", "--batch", /* Turns off pager etc. */ force ? "--force": "--skip-force", |