List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:February 16 2011 8:50pm
Subject:bzr push into mysql-5.1 branch (bjorn.munch:3593 to 3594)
View as plain text  
 3594 Bjorn Munch	2011-02-16
      Simple fix of suppress pattern in test insert_select

    modified:
      mysql-test/r/insert_select.result
      mysql-test/t/insert_select.test
 3593 Jon Olav Hauglid	2011-02-16
      Followup to Bug #11752069 (former bug 43152)
      Assertion `bitmap_is_set_all(&table->s->all_set)' failed in
      handler::ha_reset
      
      This followup fixes the compilation warning
        'test_bit' may be used uninitialized in this function
      introduced by the previous patch.

    modified:
      unittest/mysys/bitmap-t.c
=== modified file 'mysql-test/r/insert_select.result'
--- a/mysql-test/r/insert_select.result	2009-09-02 16:58:17 +0000
+++ b/mysql-test/r/insert_select.result	2011-02-16 20:43:12 +0000
@@ -841,7 +841,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-02 16:58:17 +0000
+++ b/mysql-test/t/insert_select.test	2011-02-16 20:43:12 +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).
Thread
bzr push into mysql-5.1 branch (bjorn.munch:3593 to 3594) Bjorn Munch16 Feb