diff options
| author | unknown <guilhem@mysql.com> | 2004-08-20 17:16:03 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-08-20 17:16:03 +0200 |
| commit | 4f0e2da3169968b826f0b180dfe5de0ca99b40b9 (patch) | |
| tree | de67afcfd6aef3bce9e8c4c46b510723f3e582bd /sql/sql_db.cc | |
| parent | 7c3e8f62f50836e5a3a698415736e1ea342af62a (diff) | |
| parent | cd8054d4318077827bcf20e640af6fcddf1d9525 (diff) | |
| download | mariadb-git-4f0e2da3169968b826f0b180dfe5de0ca99b40b9.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
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 2ee725e7432..3d877403813 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -42,7 +42,7 @@ int mysql_create_db(THD *thd, char *db, uint create_options, bool silent) 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; @@ -146,7 +146,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; |