diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:44:24 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:44:24 +0200 |
commit | 961c7938bb4df7a19ccd8def1e57669f7600d3e5 (patch) | |
tree | b3d208be6d95ea3e4d1ba81c78392517ffe8f7fd /mysql-test/main/parser.result | |
parent | 5adcb2e7b8f08cc459e478e5b118d924fbe18c86 (diff) | |
parent | 3467f6376472ce695e36746ba5b3c13cb5fcbb9f (diff) | |
download | mariadb-git-961c7938bb4df7a19ccd8def1e57669f7600d3e5.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/parser.result')
-rw-r--r-- | mysql-test/main/parser.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result index 86df20da9d8..f16978854ac 100644 --- a/mysql-test/main/parser.result +++ b/mysql-test/main/parser.result @@ -1825,6 +1825,15 @@ EXECUTE IMMEDIATE 'if(`systeminfo /FO LIST'; 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 '`systeminfo /FO LIST' at line 1 EXECUTE IMMEDIATE 'if(`systeminfo'; 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 '`systeminfo' at line 1 +# +# MDEV-23666 Assertion failed in Lex_input_stream::body_utf8_append +# +SET @@sql_mode='ANSI_QUOTES'; +EXECUTE IMMEDIATE 'CREATE PROCEDURE p() UPDATE t SET c=\'\'"'; +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 '"' at line 1 +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; # End of 10.3 tests # # MDEV-19540: 10.4 allow lock options with SELECT in brackets |