diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:08:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:08:46 +0300 |
| commit | eae968f62d285de97ed607c87bc131cd863d5d03 (patch) | |
| tree | b86dacfaf9e1340161d3675204544a4db937eb05 /mysql-test/main/parser.result | |
| parent | 101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a (diff) | |
| parent | bafc5c1321a7dff5f2da292111bf98fed9d1658d (diff) | |
| download | mariadb-git-eae968f62d285de97ed607c87bc131cd863d5d03.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/parser.result')
| -rw-r--r-- | mysql-test/main/parser.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result index 37f510c8ce3..78156c842ea 100644 --- a/mysql-test/main/parser.result +++ b/mysql-test/main/parser.result @@ -1764,6 +1764,13 @@ SELECT @@GLOBAL.password; ERROR HY000: Unknown system variable 'password' SELECT @@GLOBAL.role; ERROR HY000: Unknown system variable 'role' +# +# MDEV-22022 Various mangled SQL statements will crash 10.3 to 10.5 debug builds +# +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 End of 10.3 tests # # MDEV-19540: 10.4 allow lock options with SELECT in brackets |