Skip to content

M
mariadb
Commit ba97785f authored by msvensson@pilot.blaudden's avatar msvensson@pilot.blaudden
Browse files
Options

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents b9d71223 71e58855
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
client/mysql_upgrade.c
View file @ ba97785f
...@@ -444,7 +444,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res, ...@@ -444,7 +444,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res,
ret= run_tool(mysql_path, ret= run_tool(mysql_path,
ds_res, ds_res,
ds_args.str, // MASV... quoted? ds_args.str,
"--database=mysql", "--database=mysql",
"--batch", /* Turns off pager etc. */ "--batch", /* Turns off pager etc. */
force ? "--force": "--skip-force", force ? "--force": "--skip-force",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7