mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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
This commit is contained in:
@ -184,7 +184,7 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables)
|
||||
ptr[0]= tables[0].table;
|
||||
ptr[1]= tables[1].table;
|
||||
ptr[2]= tables[2].table;
|
||||
if (!(lock=mysql_lock_tables(thd,ptr,3)))
|
||||
if (! (lock= mysql_lock_tables(thd, ptr, 3, 0)))
|
||||
{
|
||||
sql_print_error("Fatal error: Can't lock privilege tables: %s",
|
||||
thd->net.last_error);
|
||||
@ -2658,7 +2658,7 @@ my_bool grant_init(THD *org_thd)
|
||||
TABLE *ptr[2]; // Lock tables for quick update
|
||||
ptr[0]= tables[0].table;
|
||||
ptr[1]= tables[1].table;
|
||||
if (!(lock=mysql_lock_tables(thd,ptr,2)))
|
||||
if (! (lock= mysql_lock_tables(thd, ptr, 2, 0)))
|
||||
goto end;
|
||||
|
||||
t_table = tables[0].table; c_table = tables[1].table;
|
||||
|
Reference in New Issue
Block a user