mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Part of fix for bug #6081 "Call to deprecated mysql_create_db() function
crashes server" (in 4.0 we fix only connection stalling in case of error, crash itself is fixed in 4.1, the test case for this code is also there).
This commit is contained in:
@ -1142,7 +1142,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
|
|||||||
if (check_access(thd,CREATE_ACL,db,0,1))
|
if (check_access(thd,CREATE_ACL,db,0,1))
|
||||||
break;
|
break;
|
||||||
mysql_log.write(thd,command,packet);
|
mysql_log.write(thd,command,packet);
|
||||||
mysql_create_db(thd,(lower_case_table_names == 2 ? alias : db),0,0);
|
if (mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
|
||||||
|
0, 0) < 0)
|
||||||
|
send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case COM_DROP_DB: // QQ: To be removed
|
case COM_DROP_DB: // QQ: To be removed
|
||||||
@ -1163,7 +1165,9 @@ 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, (lower_case_table_names == 2 ? alias : db), 0, 0);
|
if (mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db),
|
||||||
|
0, 0) < 0)
|
||||||
|
send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case COM_BINLOG_DUMP:
|
case COM_BINLOG_DUMP:
|
||||||
|
Reference in New Issue
Block a user