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

…to_list Use the same select as for usual table list.
MariaDB · Jul 24, 2019 · bccd9d0e3a96ec026d01d24abac1cea7959f0d02 · bccd9d0
1 parent 819c40d
commit bccd9d0e3a96ec026d01d24abac1cea7959f0d02
Unified Split

Showing with 28 additions and 1 deletion.

+13 −0 mysql-test/main/parser.result

+14 −0 mysql-test/main/parser.test

+1 −1 sql/sql_yacc.yy
diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result
@@ -1784,4 +1784,17 @@ a
 select * from t1 for update;
 a
 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
diff --git a/mysql-test/main/parser.test b/mysql-test/main/parser.test
@@ -1552,4 +1552,18 @@ create table t1 (a int);
 select * from t1 for update;
 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
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy

                                      ? MDL_SHARED_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,
                                           lock_type, mdl_type)))
              MYSQL_YYABORT;