summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMartin Hansson <martin.hansson@sun.com>2010-06-29 10:28:17 +0200
committerMartin Hansson <martin.hansson@sun.com>2010-06-29 10:28:17 +0200
commit836f7fcfc6ad843b11b551a8b9715422d38f2356 (patch)
tree2ee661ad44486c77fa2e07627274ca4df064fc92 /mysql-test
parent08c627c35ed68b4c4b8f1f85d3018bdf881ab62c (diff)
downloadmariadb-git-836f7fcfc6ad843b11b551a8b9715422d38f2356.tar.gz
Fix of bad merge of test case for Bug#41660 (test case moved).
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/error_simulation.test28
1 files 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
@@ -76,19 +90,5 @@ 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 #