Commit c9e4b2aa authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi

row0mysql.c Fix an assertion when an empty database is dropped

parent 5a9ce774
...@@ -1040,7 +1040,7 @@ row_create_table_for_mysql( ...@@ -1040,7 +1040,7 @@ row_create_table_for_mysql(
"InnoDB: Error: table %s already exists in InnoDB internal\n" "InnoDB: Error: table %s already exists in InnoDB internal\n"
"InnoDB: data dictionary. Have you deleted the .frm file\n" "InnoDB: data dictionary. Have you deleted the .frm file\n"
"InnoDB: and not used DROP TABLE? Have you used DROP DATABASE\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", "InnoDB: See the Restrictions section of the InnoDB manual.\n",
table->name); table->name);
fprintf(stderr, fprintf(stderr,
...@@ -1468,6 +1468,8 @@ row_drop_database_for_mysql( ...@@ -1468,6 +1468,8 @@ row_drop_database_for_mysql(
mutex_exit(&(dict_sys->mutex)); mutex_exit(&(dict_sys->mutex));
trx_commit_for_mysql(trx);
trx->op_info = ""; trx->op_info = "";
return(err); return(err);
......
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