MDEV-15316 Assertion `(thd->lex)->var_list.is_empty()' failed in MYSQ…

…Lparse
MariaDB · Mar 27, 2018 · 0f26f71 · 0f26f71
1 parent 902ace0
commit 0f26f71
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
@@ -1821,3 +1821,8 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1003	select @@FOObar.KEY_BUFfer_size AS "@@FOObar.KEY_BUFfer_size" from DUAL  where rand() > @@fooBAR.key_buffer_size
+#
+# MDEV-15316 Assertion `(thd->lex)->var_list.is_empty()' failed in MYSQLparse
+#
+SET GLOBAL mc.key_cache_age_threshold=100, mc.key_cache_block_size=1024;
+SET GLOBAL mc.key_buffer_size= 0 /*cleanup*/;
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
@@ -1540,3 +1540,10 @@ explain extended select @@VERsion from dual where rand() > @@verSION;
 explain extended select @@SESsion.SQL_mode from dual where rand() > @@sesSION.sql_MODE;
 explain extended select @@GLObal.COLLATION_connection from dual where rand() > @@gloBAL.collation_CONNECTION;
 explain extended select @@FOObar.KEY_BUFfer_size from dual where rand() > @@fooBAR.key_bufFER_SIZE;
+
+--echo #
+--echo # MDEV-15316 Assertion `(thd->lex)->var_list.is_empty()' failed in MYSQLparse
+--echo #
+
+SET GLOBAL mc.key_cache_age_threshold=100, mc.key_cache_block_size=1024;
+SET GLOBAL mc.key_buffer_size= 0 /*cleanup*/;
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
@@ -15984,7 +15984,6 @@ option_value_no_option_type:
           }
         | ident '.' ident equal set_expr_or_default
           {
-            DBUG_ASSERT(Lex->var_list.is_empty());
             if (Lex->set_variable(&$1, &$3, $5))
               MYSQL_YYABORT;
           }

diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
@@ -15839,7 +15839,6 @@ option_value_no_option_type:
           }
         | ident '.' ident equal set_expr_or_default
           {
-            DBUG_ASSERT(Lex->var_list.is_empty());
             if (Lex->set_variable(&$1, &$3, $5))
               MYSQL_YYABORT;
           }