summaryrefslogtreecommitdiff
path: root/mysql-test/main/parser.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-05-21 15:33:35 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-05-21 16:10:03 +0200
commit1921df669712135b2b6f78c96c2aa6ae9a7399f2 (patch)
treef906e638ba2d984ad1d5f827fe1bdb50e4f17d8e /mysql-test/main/parser.result
parentfceffcdf0b5c3531f32d5dce3909889d5bf2909f (diff)
downloadmariadb-git-bb-10.4-MDEV-19540.tar.gz
MDEV-19540: 10.4 allow lock options with SELECT in brackets which previous version do notbb-10.4-MDEV-19540
Check locking options and brackets combinations.
Diffstat (limited to 'mysql-test/main/parser.result')
-rw-r--r--mysql-test/main/parser.result15
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result
index 34c119a322e..2e2342161fc 100644
--- a/mysql-test/main/parser.result
+++ b/mysql-test/main/parser.result
@@ -1770,3 +1770,18 @@ ERROR HY000: Unknown system variable 'password'
SELECT @@GLOBAL.role;
ERROR HY000: Unknown system variable 'role'
End of 10.3 tests
+#
+# MDEV-19540: 10.4 allow lock options with SELECT in brackets
+# which previous version do not
+#
+create table t1 (a int);
+(select * from t1) for update;
+ERROR HY000: Incorrect usage of lock options and SELECT in brackets
+(select * from t1) union (select * from t1) for update;
+ERROR HY000: Incorrect usage of lock options and SELECT in brackets
+(select * from t1 for update);
+a
+select * from t1 for update;
+a
+drop table t1;
+# End of 10.4 tests