summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp-error.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t/sp-error.test')
-rw-r--r--mysql-test/t/sp-error.test7
1 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index 30715d9c1e0..b0c957ad164 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -3853,8 +3853,8 @@ DROP FUNCTION f2;
DROP TABLE t1;
--echo #
---echo # 10.2 Test
---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 #
@@ -3862,10 +3862,9 @@ DROP TABLE t1;
SET @old_optimizer_switch = @@SESSION.OPTIMIZER_SWITCH;
SET @cmd:="SET @@SESSION.SQL_MODE=(SELECT 'a')";
-SET @@SESSION.OPTIMIZER_SWITCH="materialization=OFF";
-SET @@SESSION.OPTIMIZER_SWITCH="in_to_exists=OFF";
--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;