summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <heikki@donna.mysql.fi>2001-10-31 08:37:39 +0200
committerunknown <heikki@donna.mysql.fi>2001-10-31 08:37:39 +0200
commit3f7cf671a1d735a72e98e89d91a16cce085e6817 (patch)
treec5285741b6767568a314f98abca1eda0a71372cb
parent4765ab612ca4f5ee35c413437f7da04889bd0a14 (diff)
downloadmariadb-git-3f7cf671a1d735a72e98e89d91a16cce085e6817.tar.gz
row0mysql.c Fix an assertion when an empty database is dropped
innobase/row/row0mysql.c: Fix an assertion when an empty database is dropped
-rw-r--r--innobase/row/row0mysql.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index 59e2c08dfda..19d2fb744c9 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -1040,7 +1040,7 @@ row_create_table_for_mysql(
"InnoDB: Error: table %s already exists in InnoDB internal\n"
"InnoDB: data dictionary. Have you deleted the .frm file\n"
"InnoDB: and not used DROP TABLE? Have you used DROP DATABASE\n"
- "InnoDB: for InnoDB tables in MySQL version <= 3.23.42?\n"
+ "InnoDB: for InnoDB tables in MySQL version <= 3.23.43?\n"
"InnoDB: See the Restrictions section of the InnoDB manual.\n",
table->name);
fprintf(stderr,
@@ -1468,6 +1468,8 @@ row_drop_database_for_mysql(
mutex_exit(&(dict_sys->mutex));
+ trx_commit_for_mysql(trx);
+
trx->op_info = "";
return(err);