From 8a2f3f4b5ed8778c00b6ad169aaad28a4eb6058c Mon Sep 17 00:00:00 2001
From: Martin Hansson <martin.hansson@sun.com>
Date: Tue, 29 Jun 2010 10:28:17 +0200
Subject: [PATCH] Fix of bad merge of test case for Bug#41660 (test case
 moved).

---
 mysql-test/t/error_simulation.test | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/mysql-test/t/error_simulation.test b/mysql-test/t/error_simulation.test
index 8e65c338f36..f6edacfaa29 100644
--- a/mysql-test/t/error_simulation.test
+++ b/mysql-test/t/error_simulation.test
@@ -45,6 +45,20 @@ SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#42064: low memory crash when importing hex strings, in Item_hex_string::Item_hex_string
+--echo #
+
+CREATE TABLE t1(a BLOB);
+
+SET SESSION debug="+d,bug42064_simulate_oom";
+# May fail with either ER_OUT_OF_RESOURCES or EE_OUTOFMEMORY
+--error ER_OUT_OF_RESOURCES, 5
+INSERT INTO t1 VALUES("");
+SET SESSION debug=DEFAULT;
+
+DROP TABLE t1;
+
 -- echo #
 -- echo # Bug#41660: Sort-index_merge for non-first join table may require 
 -- echo # O(#scans) memory
@@ -75,20 +89,6 @@ SET SESSION debug = DEFAULT;
 
 DROP TABLE t1, t2;
 
---echo #
---echo # Bug#42064: low memory crash when importing hex strings, in Item_hex_string::Item_hex_string
---echo #
-
-CREATE TABLE t1(a BLOB);
-
-SET SESSION debug="+d,bug42064_simulate_oom";
-# May fail with either ER_OUT_OF_RESOURCES or EE_OUTOFMEMORY
---error ER_OUT_OF_RESOURCES, 5
-INSERT INTO t1 VALUES("");
-SET SESSION debug=DEFAULT;
-
-DROP TABLE t1;
-
 --echo #
 --echo # End of 5.1 tests
 --echo #