Commit 57ae9ed0 authored by unknown's avatar unknown

complement to previous fix (which was for SQLCOM_DROP_DB), for COM_DROP_DB.


sql/sql_parse.cc:
  Making COM_DROP_DB honour lower_case_table_names. Plus coding-style fixes.
parent 87c200d1
...@@ -1163,7 +1163,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1163,7 +1163,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break; break;
} }
mysql_log.write(thd,command,db); mysql_log.write(thd,command,db);
mysql_rm_db(thd,alias,0,0); mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db), 0, 0);
break; break;
} }
case COM_BINLOG_DUMP: case COM_BINLOG_DUMP:
...@@ -2387,8 +2387,8 @@ mysql_execute_command(void) ...@@ -2387,8 +2387,8 @@ mysql_execute_command(void)
send_error(&thd->net,ER_LOCK_OR_ACTIVE_TRANSACTION); send_error(&thd->net,ER_LOCK_OR_ACTIVE_TRANSACTION);
goto error; goto error;
} }
res=mysql_rm_db(thd,(lower_case_table_names == 2 ? alias : lex->name), res=mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : lex->name),
lex->drop_if_exists,0); lex->drop_if_exists, 0);
break; break;
} }
case SQLCOM_CREATE_FUNCTION: case SQLCOM_CREATE_FUNCTION:
......
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