mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
merge
BitKeeper/etc/logging_ok: auto-union sql/handler.cc: Auto merged BitKeeper/deleted/.del-violite.c~984c09cffe14a11b: Auto merged BitKeeper/deleted/.del-violite.c~d7b85be615595ace: Auto merged innobase/log/log0log.c: Auto merged innobase/srv/srv0start.c: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@@ -158,6 +158,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
|
||||
error = -1;
|
||||
if ((deleted=mysql_rm_known_files(thd, dirp, db, path,0)) >= 0 && thd)
|
||||
{
|
||||
ha_drop_database(path);
|
||||
if (!silent)
|
||||
{
|
||||
if (!thd->query)
|
||||
|
Reference in New Issue
Block a user