summaryrefslogtreecommitdiff
path: root/sql/sql_handler.cc
diff options
context:
space:
mode:
authoringo@mysql.com <>2005-06-01 11:15:21 +0200
committeringo@mysql.com <>2005-06-01 11:15:21 +0200
commit0a1e38b7ed0cfe9bdb313102f6b1f26b46b1af57 (patch)
tree7a8b8f55be2cc9a973bed05c6c890d7d4cd3ca38 /sql/sql_handler.cc
parent1061c412ba9115abd3df27641b92b87ec5ad63c5 (diff)
parenteffd338f675a6a6ec4a7df4dc797549f6fbbd95b (diff)
downloadmariadb-git-0a1e38b7ed0cfe9bdb313102f6b1f26b46b1af57.tar.gz
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Manual merge from 4.1.
Diffstat (limited to 'sql/sql_handler.cc')
-rw-r--r--sql/sql_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index bb48b7ada77..1aa034ce61c 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -433,7 +433,7 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables,
protocol->send_fields(&list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF);
HANDLER_TABLES_HACK(thd);
- lock= mysql_lock_tables(thd, &tables->table, 1);
+ lock= mysql_lock_tables(thd, &tables->table, 1, 0);
HANDLER_TABLES_HACK(thd);
if (!lock)