Skip to content

Commit 0f26f71

Browse files
committed
MDEV-15316 Assertion `(thd->lex)->var_list.is_empty()' failed in MYSQLparse
1 parent 902ace0 commit 0f26f71

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

mysql-test/r/variables.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,3 +1821,8 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
18211821
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
18221822
Warnings:
18231823
Note 1003 select @@FOObar.KEY_BUFfer_size AS "@@FOObar.KEY_BUFfer_size" from DUAL where rand() > @@fooBAR.key_buffer_size
1824+
#
1825+
# MDEV-15316 Assertion `(thd->lex)->var_list.is_empty()' failed in MYSQLparse
1826+
#
1827+
SET GLOBAL mc.key_cache_age_threshold=100, mc.key_cache_block_size=1024;
1828+
SET GLOBAL mc.key_buffer_size= 0 /*cleanup*/;

mysql-test/t/variables.test

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,3 +1540,10 @@ explain extended select @@VERsion from dual where rand() > @@verSION;
15401540
explain extended select @@SESsion.SQL_mode from dual where rand() > @@sesSION.sql_MODE;
15411541
explain extended select @@GLObal.COLLATION_connection from dual where rand() > @@gloBAL.collation_CONNECTION;
15421542
explain extended select @@FOObar.KEY_BUFfer_size from dual where rand() > @@fooBAR.key_bufFER_SIZE;
1543+
1544+
--echo #
1545+
--echo # MDEV-15316 Assertion `(thd->lex)->var_list.is_empty()' failed in MYSQLparse
1546+
--echo #
1547+
1548+
SET GLOBAL mc.key_cache_age_threshold=100, mc.key_cache_block_size=1024;
1549+
SET GLOBAL mc.key_buffer_size= 0 /*cleanup*/;

sql/sql_yacc.yy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15984,7 +15984,6 @@ option_value_no_option_type:
1598415984
}
1598515985
| ident '.' ident equal set_expr_or_default
1598615986
{
15987-
DBUG_ASSERT(Lex->var_list.is_empty());
1598815987
if (Lex->set_variable(&$1, &$3, $5))
1598915988
MYSQL_YYABORT;
1599015989
}

sql/sql_yacc_ora.yy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15839,7 +15839,6 @@ option_value_no_option_type:
1583915839
}
1584015840
| ident '.' ident equal set_expr_or_default
1584115841
{
15842-
DBUG_ASSERT(Lex->var_list.is_empty());
1584315842
if (Lex->set_variable(&$1, &$3, $5))
1584415843
MYSQL_YYABORT;
1584515844
}

0 commit comments

Comments
 (0)