Fix failing test cases for MDEV-7912 patch

1 files changed, 13 insertions, 5 deletions

diff --git a/mysql-test/t/uniques_crash-7912.test b/mysql-test/t/uniques_crash-7912.test
index 010855f7fb4..8dc82f8f540 100644
--- a/mysql-test/t/uniques_crash-7912.test
+++ b/mysql-test/t/uniques_crash-7912.test
@@ -1,18 +1,26 @@
+#
 # MDEV-7912
+#
 # multitable delete with wrongly set sort_buffer_size crashes in merge_buffers
+
 --source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/windows.inc
+
+call mtr.add_suppression("Out of memory");
+
 set sql_mode="";
+--disable_warnings
 drop table if exists t1,t2;
 create table `t1` (`a` datetime not null) engine=InnoDB;
 create table `t2` (`a` int not null) engine=innodb;
-
 replace into t1 values (),();
 insert into t2 values(0);
 set session sort_buffer_size = 1024*1024*1024*1024;
-SET session debug_dbug= '+d,make_merge_buff_alloc_fail';
---error 5 #EE_OUTOFMEMORY
+#Either fail with EE_OUTOFMEMORY, or succeed
+--error 0 , 5
 delete d2 from t2 as d1, t1 as d2 where d1.a <=> d2.a;
-SET SESSION debug_dbug=DEFAULT;
+--enable_warnings
 
 drop table t2;
-drop table t1;
\ No newline at end of file
+drop table t1;