diff options
| author | monty@mysql.com <> | 2004-09-06 15:14:10 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-09-06 15:14:10 +0300 |
| commit | 31122efde725e9b472e467a7cb1807100b7e6b1e (patch) | |
| tree | d9ef905036723648a1d354d0523ef8124e4dee76 /sql/sql_rename.cc | |
| parent | 32594c99899edd6de0053609c087f04dc21fbbfd (diff) | |
| parent | 5d71817c7049e9db5c22e1667a41f57cf558d8ed (diff) | |
| download | mariadb-git-31122efde725e9b472e467a7cb1807100b7e6b1e.tar.gz | |
Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 97c4e39874c..3298eb68a91 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -48,7 +48,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list) DBUG_RETURN(1); } - if (wait_if_global_read_lock(thd,0)) + if (wait_if_global_read_lock(thd,0,1)) DBUG_RETURN(1); VOID(pthread_mutex_lock(&LOCK_open)); if (lock_table_names(thd, table_list)) |