diff options
| author | serg@serg.mylan <> | 2004-08-20 21:56:29 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-08-20 21:56:29 +0200 |
| commit | 050bf6a89f14c9870e54751fa37b0016bb4714c9 (patch) | |
| tree | d3bc4a6cf5270e88d92f8b8cc86572fd34a9405c /sql/sql_db.cc | |
| parent | b267ce4bb42c5a104e35090b69f5f1a41ffec5c2 (diff) | |
| parent | 02e93b5758f6b2f06365ee711a223e9e579c82e3 (diff) | |
| download | mariadb-git-050bf6a89f14c9870e54751fa37b0016bb4714c9.tar.gz | |
merged
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 3b12cbe3422..f786e7476ac 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -396,7 +396,7 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); // do not create database if another thread is holding read lock - if (wait_if_global_read_lock(thd,0)) + if (wait_if_global_read_lock(thd, 0, 1)) { error= -1; goto exit2; @@ -565,7 +565,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); // do not drop database if another thread is holding read lock - if (wait_if_global_read_lock(thd,0)) + if (wait_if_global_read_lock(thd, 0, 1)) { error= -1; goto exit2; |