diff options
| author | unknown <serg@serg.mylan> | 2004-08-20 22:54:42 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-20 22:54:42 +0200 |
| commit | 0745a2b783becf4b3ecb095cf8e43f67e333ba90 (patch) | |
| tree | e8510e5d3f6b221a69a2c61f979f3786df718f3a /sql/sql_db.cc | |
| parent | 5f74f8d5faf57740cdd43c03a9d5a8d58a357e45 (diff) | |
| download | mariadb-git-0745a2b783becf4b3ecb095cf8e43f67e333ba90.tar.gz | |
after merge fix
myisam/Makefile.am:
put zlib at the end (libtool adds the whole bunch of dependencies right after that)
sql/Makefile.am:
put zlib at the end (libtool adds the whole bunch of dependencies right after that)
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index f786e7476ac..cfc75e3be95 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -498,7 +498,7 @@ int mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info) VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); // do not alter database if another thread is holding read lock - if ((error=wait_if_global_read_lock(thd,0))) + if ((error=wait_if_global_read_lock(thd,0,1))) goto exit2; /* Check directory */ |