Skip to content

M
mariadb
Commit e5f30a83 authored by monty@mysql.com's avatar monty@mysql.com
Browse files
Options

After merge fixes

parent 91c80cf4
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/sql_parse.cc
View file @ e5f30a83
...@@ -1575,7 +1575,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1575,7 +1575,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
mysql_log.write(thd,command,packet); mysql_log.write(thd,command,packet);
if (mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db), if (mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
0, 0) < 0) 0, 0) < 0)
send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0); send_error(thd, thd->killed ? ER_SERVER_SHUTDOWN : 0);
break; break;
} }
case COM_DROP_DB: // QQ: To be removed case COM_DROP_DB: // QQ: To be removed
...@@ -1598,7 +1598,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1598,7 +1598,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
mysql_log.write(thd,command,db); mysql_log.write(thd,command,db);
if (mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db), if (mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db),
0, 0) < 0) 0, 0) < 0)
send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0); send_error(thd, thd->killed ? ER_SERVER_SHUTDOWN : 0);
break; break;
} }
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
......
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