From: Martin Hansson
Date: January 25 2012 11:43am
Subject: bzr push into mysql-trunk branch (martin.hansson:3781 to 3782) Bug#13536661
List-Archive: http://lists.mysql.com/commits/142561
X-Bug: 13536661
Message-Id: <201201251143.q0PBhlUb006823@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3782 Martin Hansson	2012-01-25
      Bug#13536661: Deactivates the test case until a better place for it is found.

    modified:
      mysql-test/r/temp_table.result
      mysql-test/t/temp_table.test
 3781 Mayank Prasad	2012-01-25
      Bug#13570079: - MAIN.MYSQL_EMBEDDED TEST FAILS ON WINDOWS-X86-64BIT ON DAILY-TRUNK
      
      Description: 
      -This test case (mysql_embedded) was failing on WINODWS 64 only.
      
      Issue:
      -In mysql_embedded test case, queries was wrappen in single
       quote ('), which was not treated as string delimiter. 
      
      Solution:
      -Changed single quote (') to double quote (") and test case
       is passing now.

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/t/mysql_embedded.test
=== modified file 'mysql-test/r/temp_table.result'
--- a/mysql-test/r/temp_table.result	2012-01-25 08:46:00 +0000
+++ b/mysql-test/r/temp_table.result	2012-01-25 11:42:57 +0000
@@ -271,20 +271,3 @@ test.t1	repair	status	OK
 test.t2	repair	status	OK
 test.t3	repair	status	OK
 DROP TABLES t1, t2, t3;
-#
-# 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;

=== modified file 'mysql-test/t/temp_table.test'
--- a/mysql-test/t/temp_table.test	2012-01-25 08:46:00 +0000
+++ b/mysql-test/t/temp_table.test	2012-01-25 11:42:57 +0000
@@ -295,29 +295,31 @@ REPAIR TABLE t1, t2, t3;
 
 DROP TABLES t1, t2, t3;
 
---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;
+# Test case temporarily deactivated until we can find a place to move it 
+# --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;
+# 
\ No newline at end of file

No bundle (reason: useless for push emails).