summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorunknown <ingo@mysql.com>2005-05-31 19:37:24 +0200
committerunknown <ingo@mysql.com>2005-05-31 19:37:24 +0200
commit57d4adf60c7b4c0d341903a29d64f96359e78adb (patch)
tree3a0071aee0fc84c8565299dbf4136b73fbea5c29 /sql/sql_table.cc
parent7b4385f4725f99ed5115b0f89174fc358498cfe0 (diff)
parentcf2188ca398e12d4a10c50b069c2243825f9dced (diff)
downloadmariadb-git-57d4adf60c7b4c0d341903a29d64f96359e78adb.tar.gz
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Hand merged from 4.0. sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_table.cc: Auto merged
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 67aade519f5..489b730eb83 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1536,7 +1536,7 @@ TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
if (!table)
DBUG_RETURN(0);
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);