diff options
| author | unknown <ingo@mysql.com> | 2006-06-26 19:43:28 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-06-26 19:43:28 +0200 |
| commit | 8fe3c29f84a49d6338a63e53d0ab6c46d8d181a3 (patch) | |
| tree | 3f0cf8c754824d2c2dd7cb52d7d04e7865245b7a /sql/sql_table.cc | |
| parent | 90ff8fbd380154b6b1efef259d326185277f007a (diff) | |
| parent | 70c7e30d16bb4599d945a92dd7ca7a8da7c1cec8 (diff) | |
| download | mariadb-git-8fe3c29f84a49d6338a63e53d0ab6c46d8d181a3.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug16986-main
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 77c681d4a48..c9e6384ba72 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1689,8 +1689,6 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name, my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alias); DBUG_RETURN(TRUE); } - if (wait_if_global_read_lock(thd, 0, 1)) - DBUG_RETURN(TRUE); VOID(pthread_mutex_lock(&LOCK_open)); if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) { @@ -1758,7 +1756,6 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name, end: VOID(pthread_mutex_unlock(&LOCK_open)); - start_waiting_global_read_lock(thd); thd->proc_info="After create"; DBUG_RETURN(error); @@ -1938,7 +1935,7 @@ void close_cached_table(THD *thd, TABLE *table) thd->open_tables=unlink_open_table(thd,thd->open_tables,table); /* When lock on LOCK_open is freed other threads can continue */ - pthread_cond_broadcast(&COND_refresh); + broadcast_refresh(); DBUG_VOID_RETURN; } @@ -3909,7 +3906,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, if (error) { VOID(pthread_mutex_unlock(&LOCK_open)); - VOID(pthread_cond_broadcast(&COND_refresh)); + broadcast_refresh(); goto err; } thd->proc_info="end"; @@ -3919,7 +3916,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, Query_log_event qinfo(thd, thd->query, thd->query_length, FALSE, FALSE); mysql_bin_log.write(&qinfo); } - VOID(pthread_cond_broadcast(&COND_refresh)); + broadcast_refresh(); VOID(pthread_mutex_unlock(&LOCK_open)); #ifdef HAVE_BERKELEY_DB if (old_db_type == DB_TYPE_BERKELEY_DB) |