database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

Browse Source
This commit is contained in:
gluh@gluh.mysql.r18.ru
2003-08-27 18:03:39 +05:00
parent 1d0b539263
commit 4c076ea6d7
3 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/drop.result
View File

@ -44,3 +44,13 @@ mysql
test test
drop database mysqltest; drop database mysqltest;
ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist
drop table t1;
flush tables with read lock;
create table t1(n int);
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
unlock tables;
create table t1(n int);
show tables;
Tables_in_test
t1
drop table t1;

10
mysql-test/t/drop.test
View File

@ -43,3 +43,13 @@ drop database mysqltest;
show databases; show databases;
--error 1008 --error 1008
drop database mysqltest; drop database mysqltest;
# test create table and FLUSH TABLES WITH READ LOCK
drop table t1;
flush tables with read lock;
--error 1099;
create table t1(n int);
unlock tables;
create table t1(n int);
show tables;
drop table t1;

17
sql/sql_table.cc
View File

@ -900,6 +900,23 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
VOID(pthread_mutex_lock(&LOCK_open)); VOID(pthread_mutex_lock(&LOCK_open));
if (global_read_lock)
{
thd->mysys_var->current_mutex= &LOCK_open;
thd->mysys_var->current_cond= &COND_refresh;
if (thd->global_read_lock)
my_error(ER_TABLE_NOT_LOCKED_FOR_WRITE,MYF(0),
table_name);
else
while (global_read_lock && ! thd->killed)
(void) pthread_cond_wait(&COND_refresh,&LOCK_open);
pthread_mutex_lock(&thd->mysys_var->mutex);
thd->mysys_var->current_mutex= 0;
thd->mysys_var->current_cond= 0;
pthread_mutex_unlock(&thd->mysys_var->mutex);
if (error)
goto end;
}
if (!tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) if (!tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
{ {
if (!access(path,F_OK)) if (!access(path,F_OK))