From 8c7f7bae47922b44ddae1db587afc7ee029c8b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Wed, 22 Jul 2020 08:48:14 +0300
Subject: Fix regex on test.

---
 mysql-test/suite/galera/t/galera_var_cluster_conf_id.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/suite/galera/t/galera_var_cluster_conf_id.test b/mysql-test/suite/galera/t/galera_var_cluster_conf_id.test
index dd4a630035d..668ace297a8 100644
--- a/mysql-test/suite/galera/t/galera_var_cluster_conf_id.test
+++ b/mysql-test/suite/galera/t/galera_var_cluster_conf_id.test
@@ -1,9 +1,9 @@
 --source include/galera_cluster.inc
 
 --connection node_1
---replace_regex /18446744073709551/ERROR/ /[0-9+]/#/
+--replace_regex /18446744073709551/ERROR/ /[0-9]+/#/
 show status like 'wsrep_cluster_conf_id';
 
 --connection node_2
---replace_regex /18446744073709551/ERROR/ /[0-9+]/#/
+--replace_regex /18446744073709551/ERROR/ /[0-9]+/#/
 show status like 'wsrep_cluster_conf_id';
-- 
cgit v1.2.1


From ddb8309e8c1bac8d419fe5c224665c6dca1e2878 Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Tue, 21 Jul 2020 10:31:10 +0200
Subject: MDEV-21997 Server crashes in LEX::create_item_ident_sp upon use of
 unknown identifier

If there is no current_select and variable is not found among SP variables it can be only an error.
---
 mysql-test/main/parser.result | 55 ++++++++++++++++++++++++++++++++++++
 mysql-test/main/parser.test   | 66 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result
index 42fdc01617b..ad22cd886f7 100644
--- a/mysql-test/main/parser.result
+++ b/mysql-test/main/parser.result
@@ -1838,4 +1838,59 @@ ERROR 42S02: Table 'test.t1' doesn't exist
 SET STATEMENT max_statement_time=180 FOR BACKUP LOCK test.t1;
 SET STATEMENT max_statement_time=180 FOR BACKUP UNLOCK;
 set SQL_MODE=@save_sql_mode;
+#
+# MDEV-21997: Server crashes in LEX::create_item_ident_sp
+# upon use of unknown identifier
+#
+/*! IF 1 IN ( SELECT 2 ) OR foo = 3 THEN */ SELECT 4;
+ERROR 42000: Undeclared variable: foo
+BEGIN NOT ATOMIC
+IF (SELECT 2) OR foo = 3 THEN
+SELECT 4;
+END IF ;
+END;
+$$
+ERROR 42000: Undeclared variable: foo
+# ... but if declare it then it still work
+BEGIN NOT ATOMIC
+DECLARE foo int;
+IF (SELECT 2) OR foo = 3 THEN
+SELECT 4;
+END IF ;
+END;
+$$
+4
+4
+CASE (SELECT 2) OR foo
+WHEN 1 THEN
+SET @x=10;
+$$
+ERROR 42000: Undeclared variable: foo
+/*! WHILE (SELECT 2) OR foo */
+SET @x=10;
+END WHILE;
+$$
+ERROR 42000: Undeclared variable: foo
+REPEAT
+SET @x=10;
+UNTIL (SELECT 2) OR foo
+END REPEAT;
+$$
+ERROR 42000: Undeclared variable: foo
+FOR i IN 1..(SELECT 2) OR foo
+DO
+SET @x=10;
+END FOR;
+$$
+ERROR 42000: Undeclared variable: foo
+# ... but automatic FOR variable still work
+FOR i IN 1..2
+DO
+SELECT i;
+END FOR;
+$$
+i
+1
+i
+2
 # End of 10.4 tests
diff --git a/mysql-test/main/parser.test b/mysql-test/main/parser.test
index 8aa2fb528ea..09fe73b7dbe 100644
--- a/mysql-test/main/parser.test
+++ b/mysql-test/main/parser.test
@@ -1613,4 +1613,70 @@ SET STATEMENT max_statement_time=180 FOR BACKUP LOCK test.t1;
 SET STATEMENT max_statement_time=180 FOR BACKUP UNLOCK;
 set SQL_MODE=@save_sql_mode;
 
+
+--echo #
+--echo # MDEV-21997: Server crashes in LEX::create_item_ident_sp
+--echo # upon use of unknown identifier
+--echo #
+
+--error ER_SP_UNDECLARED_VAR
+/*! IF 1 IN ( SELECT 2 ) OR foo = 3 THEN */ SELECT 4;
+
+
+DELIMITER $$;
+
+--error ER_SP_UNDECLARED_VAR
+BEGIN NOT ATOMIC
+  IF (SELECT 2) OR foo = 3 THEN
+    SELECT 4;
+  END IF ;
+END;
+$$
+
+--echo # ... but if declare it then it still work
+BEGIN NOT ATOMIC
+  DECLARE foo int;
+  IF (SELECT 2) OR foo = 3 THEN
+    SELECT 4;
+  END IF ;
+END;
+$$
+
+--error ER_SP_UNDECLARED_VAR
+CASE (SELECT 2) OR foo
+WHEN 1 THEN
+  SET @x=10;
+$$
+
+--error ER_SP_UNDECLARED_VAR
+/*! WHILE (SELECT 2) OR foo */
+  SET @x=10;
+END WHILE;
+$$
+
+--error ER_SP_UNDECLARED_VAR
+REPEAT
+  SET @x=10;
+UNTIL (SELECT 2) OR foo
+END REPEAT;
+$$
+
+--error ER_SP_UNDECLARED_VAR
+FOR i IN 1..(SELECT 2) OR foo
+DO
+  SET @x=10;
+END FOR;
+$$
+
+--echo # ... but automatic FOR variable still work
+FOR i IN 1..2
+DO
+  SELECT i;
+END FOR;
+$$
+
+DELIMITER ;$$
+
+
+
 --echo # End of 10.4 tests
-- 
cgit v1.2.1