MDEV-29074 GET_BIT variables crash in SET STATEMENT

MariaDB · Jul 26, 2022 · bc40985 · bc40985
1 parent 0ee5cf8
commit bc40985
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/mysql-test/main/set_statement.result b/mysql-test/main/set_statement.result
@@ -1242,3 +1242,15 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(3) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
+#
+# MDEV-29074 GET_BIT variables crash in SET STATEMENT
+#
+set statement log_queries_not_using_indexes=1 for select @@log_queries_not_using_indexes;
+@@log_queries_not_using_indexes
+1
+select @@log_queries_not_using_indexes;
+@@log_queries_not_using_indexes
+0
+#
+# End of 10.3 tests
+#
diff --git a/mysql-test/main/set_statement.test b/mysql-test/main/set_statement.test
@@ -1159,3 +1159,13 @@ SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR CREATE TABLE t1 AS SELECT
 SHOW CREATE TABLE t1;
 
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-29074 GET_BIT variables crash in SET STATEMENT
+--echo #
+set statement log_queries_not_using_indexes=1 for select @@log_queries_not_using_indexes;
+select @@log_queries_not_using_indexes;
+
+--echo #
+--echo # End of 10.3 tests
+--echo #
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -3313,6 +3313,7 @@ bool run_set_statement_if_requested(THD *thd, LEX *lex)
       {
         switch (v->var->option.var_type & GET_TYPE_MASK)
         {
+          case GET_BIT:
           case GET_BOOL:
           case GET_INT:
           case GET_LONG: