diff options
| author | unknown <ingo@mysql.com> | 2005-06-01 11:15:21 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-06-01 11:15:21 +0200 |
| commit | 046ced266a4797fa133961fe51c73a33b94504af (patch) | |
| tree | 7a8b8f55be2cc9a973bed05c6c890d7d4cd3ca38 /sql/sql_table.cc | |
| parent | abbdab6ac9be805170ebdae4d0c68dc9c2ab9de4 (diff) | |
| parent | 10481cd0368cb2ae07efd0f05c65748c3046eff8 (diff) | |
| download | mariadb-git-046ced266a4797fa133961fe51c73a33b94504af.tar.gz | |
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Manual merge from 4.1.
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 f44d3191375..acde8868583 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1756,7 +1756,7 @@ TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, } table->reginfo.lock_type=TL_WRITE; - if (!((*lock)= mysql_lock_tables(thd, &table,1))) + if (! ((*lock)= mysql_lock_tables(thd, &table, 1, MYSQL_LOCK_IGNORE_FLUSH))) { VOID(pthread_mutex_lock(&LOCK_open)); hash_delete(&open_cache,(byte*) table); |