summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2001-10-11 03:43:47 +0200
committerunknown <monty@work.mysql.com>2001-10-11 03:43:47 +0200
commit78ea62d80f2265db08e9842e3a6dc3678f46dd0a (patch)
tree40989079fc69615ed92bf1cc5bfc03e6f9e512ff /sql/sql_db.cc
parent2f4e168159e72028633fe5005dd3e85211fc476e (diff)
parent1904897be71cba7e6f2cf1192ba0cc2e8d907e00 (diff)
downloadmariadb-git-78ea62d80f2265db08e9842e3a6dc3678f46dd0a.tar.gz
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
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 05b380ebd77..2e836dc48d0 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -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)