database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

sql_db.cc:

Browse Source 
Revert Monty's change to the positioning of ha_drop_database(): otherwise a running query on a table to be dropped in DROP DATABASE always causes the server to hang
This commit is contained in:
heikki@hundin.mysql.fi
2002-07-15 15:47:53 +03:00
parent 8c827e2800
commit c620486287
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_db.cc
View File

@@ -166,7 +166,6 @@ void mysql_rm_db(THD *thd,char *db,bool if_exists)
if ((deleted=mysql_rm_known_files(thd, dirp, path,0)) >= 0)
{
ha_drop_database(path);
if (!thd->query)
{
thd->query = path;
@@ -190,6 +189,17 @@ void mysql_rm_db(THD *thd,char *db,bool if_exists)
exit:
VOID(pthread_mutex_unlock(&LOCK_open));
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
/* If there are running queries on the tables, MySQL needs to get
access to LOCK_open to end them. InnoDB on the other hand waits
for the queries to end before dropping the database. That is why we
must do the dropping outside of the mutexes above, otherwise the server
always hangs if there are running queries. We only drop inside InnoDB
if deleted got value >= 0 which means that it was successful. */
if (deleted >= 0)
ha_drop_database(path);
DBUG_VOID_RETURN;
}