database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-20108: [ERROR] mysqld got signal 11 in st_select_lex::add_table_to_list

Browse Source 
Use the same select as for usual table list.
This commit is contained in:
Oleksandr Byelkin
2019-07-24 13:20:36 +02:00
parent 819c40d694
commit bccd9d0e3a
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/main/parser.result
View File

@ -1784,4 +1784,17 @@ a
select * from t1 for update; select * from t1 for update;
a a
drop table t1; drop table t1;
#
# MDEV-20108: [ERROR] mysqld got signal 11 in
# st_select_lex::add_table_to_list
#
CREATE TABLE t1 (c1 INT NULL);
CREATE TABLE t2 (c1 INT NULL);
SET STATEMENT max_statement_time=900 FOR LOCK TABLES `t1` WRITE;
select * from t1;
c1
select * from t2;
ERROR HY000: Table 't2' was not locked with LOCK TABLES
SET STATEMENT max_statement_time=900 FOR unlock tables;
drop table t1, t2;
# End of 10.4 tests # End of 10.4 tests

14
mysql-test/main/parser.test
View File

@ -1552,4 +1552,18 @@ create table t1 (a int);
select * from t1 for update; select * from t1 for update;
drop table t1; drop table t1;
--echo #
--echo # MDEV-20108: [ERROR] mysqld got signal 11 in
--echo # st_select_lex::add_table_to_list
--echo #
CREATE TABLE t1 (c1 INT NULL);
CREATE TABLE t2 (c1 INT NULL);
SET STATEMENT max_statement_time=900 FOR LOCK TABLES `t1` WRITE;
select * from t1;
--error ER_TABLE_NOT_LOCKED
select * from t2;
SET STATEMENT max_statement_time=900 FOR unlock tables;
drop table t1, t2;
--echo # End of 10.4 tests --echo # End of 10.4 tests

2
sql/sql_yacc.yy
View File

@ -16715,7 +16715,7 @@ table_lock:
? MDL_SHARED_WRITE ? MDL_SHARED_WRITE
: MDL_SHARED_NO_READ_WRITE; : MDL_SHARED_NO_READ_WRITE;
if (unlikely(!Select-> if (unlikely(!Lex->current_select_or_default()->
add_table_to_list(thd, $1, $2, table_options, add_table_to_list(thd, $1, $2, table_options,
lock_type, mdl_type))) lock_type, mdl_type)))
MYSQL_YYABORT; MYSQL_YYABORT;