From: Bjorn Munch
Date: February 16 2011 8:49pm
Subject: bzr push into mysql-5.5 branch (bjorn.munch:3333 to 3334)
List-Archive: http://lists.mysql.com/commits/131479
Message-Id: <201102162049.p1GKndxB017675@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3334 Bjorn Munch	2011-02-16 [merge]
      Simple fix of suppress pattern in test insert_select

    modified:
      mysql-test/r/insert_select.result
      mysql-test/t/insert_select.test
 3333 Jon Olav Hauglid	2011-02-16 [merge]
      Merge from mysql-5.1 to mysql-5.5
      No conflicts

    modified:
      unittest/mysys/bitmap-t.c
=== modified file 'mysql-test/r/insert_select.result'
--- a/mysql-test/r/insert_select.result	2010-08-25 19:00:38 +0000
+++ b/mysql-test/r/insert_select.result	2011-02-16 20:45:52 +0000
@@ -842,7 +842,7 @@ SET max_heap_table_size = 16384;
 SET @old_myisam_data_pointer_size = @@myisam_data_pointer_size;
 SET GLOBAL myisam_data_pointer_size = 2;
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
-call mtr.add_suppression("mysqld: The table '.*#sql.*' is full");
+call mtr.add_suppression("mysqld.*: The table '.*#sql.*' is full");
 INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7;
 Got one of the listed errors
 SET GLOBAL myisam_data_pointer_size = @old_myisam_data_pointer_size;

=== modified file 'mysql-test/t/insert_select.test'
--- a/mysql-test/t/insert_select.test	2009-09-22 21:41:37 +0000
+++ b/mysql-test/t/insert_select.test	2011-02-16 20:45:52 +0000
@@ -407,7 +407,7 @@ SET GLOBAL myisam_data_pointer_size = 2;
 
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
 
-call mtr.add_suppression("mysqld: The table '.*#sql.*' is full");
+call mtr.add_suppression("mysqld.*: The table '.*#sql.*' is full");
 --error ER_RECORD_FILE_FULL,ER_RECORD_FILE_FULL
 INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7;
 

No bundle (reason: useless for push emails).