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_table.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_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 9ff46f219b1..b0b92178198 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1206,7 +1206,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alias); DBUG_RETURN(-1); } - if (wait_if_global_read_lock(thd, 0)) + if (wait_if_global_read_lock(thd, 0, 1)) DBUG_RETURN(error); VOID(pthread_mutex_lock(&LOCK_open)); if (!tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) |