summaryrefslogtreecommitdiff
path: root/mysql-test/main/sp-error.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-07-14 17:13:37 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-07-14 22:59:19 +0300
commit8a0944080c950349aaf7c81bc8f8c63b262f98eb (patch)
tree660faff324d2f66e57e2800155196739bf972dc1 /mysql-test/main/sp-error.test
parentf3f23b5c4bdc669ad0af4a1c79bd70c40ed9c594 (diff)
parent07e89bf7d15ba9e9a3b21d087c20d687446b2ff7 (diff)
downloadmariadb-git-8a0944080c950349aaf7c81bc8f8c63b262f98eb.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/sp-error.test')
-rw-r--r--mysql-test/main/sp-error.test19
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/main/sp-error.test b/mysql-test/main/sp-error.test
index 61a3974a1df..082b7b8698f 100644
--- a/mysql-test/main/sp-error.test
+++ b/mysql-test/main/sp-error.test
@@ -3851,3 +3851,22 @@ SELECT @msg;
DROP FUNCTION f1;
DROP FUNCTION f2;
DROP TABLE t1;
+
+--echo #
+--echo # 10.2 Test
+--echo #
+--echo # MDEV-MDEV-22058: Assertion `!is_set() || (m_status == DA_OK_BULK &&
+--echo # is_bulk_op())' failed in Diagnostics_area::set_ok_status
+--echo #
+
+SET @old_optimizer_switch = @@SESSION.OPTIMIZER_SWITCH;
+
+SET @cmd:="SET @@SESSION.SQL_MODE=(SELECT 'a')";
+
+--error ER_ILLEGAL_SUBQUERY_OPTIMIZER_SWITCHES
+SET @@SESSION.OPTIMIZER_SWITCH="in_to_exists=OFF,materialization=OFF";
+PREPARE stmt FROM @cmd;
+
+set @@SESSION.OPTIMIZER_SWITCH=@old_optimizer_switch;
+
+--echo # End of 10.2 Test