summaryrefslogtreecommitdiff
path: root/mysql-test/main/parser.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 16:10:02 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 16:10:02 +0200
commitfb0808c450849e00993fa38839f33969a9daf7e8 (patch)
tree55aca4c3c7dff7e09a13efa6dcfb58d5e91def35 /mysql-test/main/parser.result
parentfb41117c907a99d051ac09c229762978373d7eb0 (diff)
parent8760f6907c51e0e20242a53188be5b62029d6f1a (diff)
downloadmariadb-git-fb0808c450849e00993fa38839f33969a9daf7e8.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/parser.result')
-rw-r--r--mysql-test/main/parser.result11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result
index 6f05caec0bd..32cc70bf50c 100644
--- a/mysql-test/main/parser.result
+++ b/mysql-test/main/parser.result
@@ -1870,8 +1870,19 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
EXECUTE IMMEDIATE 'CREATE PROCEDURE p() UPDATE t SET c=\'\'"abc';
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"abc' at line 1
SET @@sql_mode=@save_sql_mode;
+#
+# MDEV-30151 parse error 1=2 not between/in
+#
+select 1=2 not in (3,4);
+1=2 not in (3,4)
+1
+select 1=2 not between 3 and 4;
+1=2 not between 3 and 4
+1
+#
# End of 10.3 tests
#
+#
# MDEV-19540: 10.4 allow lock options with SELECT in brackets
# which previous version do not
#