database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for BUG#2333 "ALTER DATABASE on inexistent database hangs the client":

Browse Source 
mysql_alter_db() now returns -1 in case of error, so that mysql_execute_command()
calls send_error().
This commit is contained in:
guilhem@gbichot2
2004-01-12 21:05:41 +01:00
parent ecf8118cff
commit 0b16ef245f
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_db.cc
View File

@ -270,11 +270,8 @@ int mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
// do not alter database if another thread is holding read lock
if (wait_if_global_read_lock(thd,0))
{
error= -1;
if ((error=wait_if_global_read_lock(thd,0)))
goto exit2;
}
/* Check directory */
(void)sprintf(path,"%s/%s/%s", mysql_data_home, db, MY_DB_OPT_FILE);
@ -307,7 +304,7 @@ exit:
start_waiting_global_read_lock(thd);
exit2:
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
DBUG_RETURN(error);
DBUG_RETURN(error ? -1 : 0); /* -1 to delegate send_error() */
}