diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-04-01 22:47:09 +0500 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-04-01 22:47:09 +0500 |
| commit | 9be599fc3da6e6d9b7bf1aa4836af93ca30bbf5d (patch) | |
| tree | 97f888ec2a178d85bbfa05fcfe5f91a1282adfbb /sql/sql_rename.cc | |
| parent | b26165d3a2eeb748b9bd5573f9bac7b73d5f9a37 (diff) | |
| download | mariadb-git-9be599fc3da6e6d9b7bf1aa4836af93ca30bbf5d.tar.gz | |
fixed
BUG #2397 "RENAME TABLES is not blocked by FLUSH TABLES WITH READ LOCK"
(added waiting for global_read_lock in mysql_rename_tables)
mysql-test/r/rename.result:
added test for
BUG #2397 "RENAME TABLES is not blocked by FLUSH TABLES WITH READ LOCK"
mysql-test/t/rename.test:
added test for
BUG #2397 "RENAME TABLES is not blocked by FLUSH TABLES WITH READ LOCK"
sql/sql_rename.cc:
fixed
BUG #2397 "RENAME TABLES is not blocked by FLUSH TABLES WITH READ LOCK"
(added waiting for global_read_lock)
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 6cff90ff613..7793e7236c0 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -46,6 +46,8 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list) DBUG_RETURN(1); } + if (wait_if_global_read_lock(thd,0)) + DBUG_RETURN(1); VOID(pthread_mutex_lock(&LOCK_open)); if (lock_table_names(thd, table_list)) goto err; @@ -93,6 +95,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list) err: pthread_mutex_unlock(&LOCK_open); + start_waiting_global_read_lock(thd); DBUG_RETURN(error); } |