bzr push into mysql-trunk branch (tor.didriksen:3541 to 3542)

[Tor Didriksen]

 3542 Tor Didriksen	2012-01-31
      Disable test for 13536661

    modified:
      mysql-test/r/optimizer_debug_sync.result
      mysql-test/t/optimizer_debug_sync.test
 3541 Tor Didriksen	2012-01-30
      Shuffle tests around, seems like we need the --exit

    modified:
      mysql-test/r/optimizer_debug_sync.result
      mysql-test/t/optimizer_debug_sync.test
=== modified file 'mysql-test/r/optimizer_debug_sync.result'
--- a/mysql-test/r/optimizer_debug_sync.result	2012-01-30 15:47:28 +0000
+++ b/mysql-test/r/optimizer_debug_sync.result	2012-01-31 06:42:46 +0000
@@ -1,20 +1,3 @@
-#
-# Bug #13536661: VALGRIND: DEFINITELY LOST: 552 BYTES IN 1 BLOCKS IN
-# CREATE_TMP_TABLE AND HIGHER
-#
-CREATE TABLE t1 ( a INT, b INT );
-INSERT INTO t1 VALUES (4, 40), (1, 10), (2, 20), (2, 20), (3, 30);
-SET debug_sync = "tmp_table_created SIGNAL parked WAIT_FOR go";
-# This should not leak memory.
-SELECT b, COUNT(DISTINCT b) FROM t1 GROUP BY b ORDER BY -b;
-SET debug_sync = "now WAIT_FOR parked";
-# Set locally to shadow the global variable.
-SET debug = '';
-SET GLOBAL debug = '+d,simulate_out_of_memory';
-SET debug_sync = "now SIGNAL go";
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
-SET GLOBAL debug = '';
-DROP TABLE t1;
 
 BUG#11763382 Assertion 'inited==INDEX' on SELECT MAX(...)
 

=== modified file 'mysql-test/t/optimizer_debug_sync.test'
--- a/mysql-test/t/optimizer_debug_sync.test	2012-01-30 15:47:28 +0000
+++ b/mysql-test/t/optimizer_debug_sync.test	2012-01-31 06:42:46 +0000
@@ -5,35 +5,6 @@
 --source include/have_innodb.inc
 --source include/have_materialization.inc
 
---echo #
---echo # Bug #13536661: VALGRIND: DEFINITELY LOST: 552 BYTES IN 1 BLOCKS IN
---echo # CREATE_TMP_TABLE AND HIGHER
---echo #
-CREATE TABLE t1 ( a INT, b INT );
-INSERT INTO t1 VALUES (4, 40), (1, 10), (2, 20), (2, 20), (3, 30);
-
-connect(con1,localhost,root,,);
-SET debug_sync = "tmp_table_created SIGNAL parked WAIT_FOR go";
---echo # This should not leak memory.
-send SELECT b, COUNT(DISTINCT b) FROM t1 GROUP BY b ORDER BY -b;
-
-connection default;
-SET debug_sync = "now WAIT_FOR parked";
---echo # Set locally to shadow the global variable.
-SET debug = '';
-SET GLOBAL debug = '+d,simulate_out_of_memory';
-
-SET debug_sync = "now SIGNAL go";
-
-connection con1;
---error ER_OUT_OF_RESOURCES
-reap;
-SET GLOBAL debug = '';
-
-DROP TABLE t1;
---disconnect con1
---connection default
-
 --echo
 --echo BUG#11763382 Assertion 'inited==INDEX' on SELECT MAX(...)
 --echo
@@ -88,3 +59,32 @@ DROP TABLE t;
 --exit
 
 --echo # End of BUG#56080
+--echo #
+--echo # Bug #13536661: VALGRIND: DEFINITELY LOST: 552 BYTES IN 1 BLOCKS IN
+--echo # CREATE_TMP_TABLE AND HIGHER
+--echo #
+CREATE TABLE t1 ( a INT, b INT );
+INSERT INTO t1 VALUES (4, 40), (1, 10), (2, 20), (2, 20), (3, 30);
+
+connect(con1,localhost,root,,);
+SET debug_sync = "tmp_table_created SIGNAL parked WAIT_FOR go";
+--echo # This should not leak memory.
+send SELECT b, COUNT(DISTINCT b) FROM t1 GROUP BY b ORDER BY -b;
+
+connection default;
+SET debug_sync = "now WAIT_FOR parked";
+--echo # Set locally to shadow the global variable.
+SET debug = '';
+SET GLOBAL debug = '+d,simulate_out_of_memory';
+
+SET debug_sync = "now SIGNAL go";
+
+connection con1;
+--error ER_OUT_OF_RESOURCES
+reap;
+SET GLOBAL debug = '';
+
+DROP TABLE t1;
+--disconnect con1
+--connection default
+

No bundle (reason: useless for push emails).