bzr commit into mysql-6.0 branch (guilhem:2728) Bug#43001

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos/mysql-6.0-maria/ based on revid:guilhem@stripped

 2728 Guilhem Bichot	2009-03-17
      BUG#43001 "maria.maria-no-logging fails sporadically on valgrind in PS mode" still happens and this
      time the cause seems to be Falcon failing to start during one of the restarts done by the test
     @ mysql-test/suite/maria/t/maria-autozerofill-master.opt
        sometimes Falcon fails to start during one of the restarts done by this test, work around
     @ mysql-test/suite/maria/t/maria-no-logging-master.opt
        sometimes Falcon fails to start during one of the restarts done by this test, work around
     @ mysql-test/suite/maria/t/maria-recovery-bitmap.test
        this flooded the error log with uninteresting debug info
     @ mysql-test/suite/maria/t/maria-recovery2.test
        this flooded the error log with uninteresting debug info

    added:
      mysql-test/suite/maria/t/maria-autozerofill-master.opt
      mysql-test/suite/maria/t/maria-no-logging-master.opt
    modified:
      mysql-test/suite/maria/r/maria-recovery-bitmap.result
      mysql-test/suite/maria/r/maria-recovery2.result
      mysql-test/suite/maria/t/maria-recovery-bitmap.test
      mysql-test/suite/maria/t/maria-recovery2.test
=== modified file 'mysql-test/suite/maria/r/maria-recovery-bitmap.result'
--- a/mysql-test/suite/maria/r/maria-recovery-bitmap.result	2008-10-01 12:13:39 +0000
+++ b/mysql-test/suite/maria/r/maria-recovery-bitmap.result	2009-03-17 14:53:45 +0000
@@ -9,7 +9,7 @@ flush table t1;
 * copied t1 for comparison
 insert into t1 values ("bbbbbbb");
 delete from t1 limit 1;
-set session debug="+d,info,enter,exit,maria_over_alloc_bitmap";
+set session debug="+d,maria_over_alloc_bitmap";
 insert into t1 values ("aaaaaaaaa");
 set global maria_checkpoint_interval=1;
 SET SESSION debug="+d,maria_crash";

=== modified file 'mysql-test/suite/maria/r/maria-recovery2.result'
--- a/mysql-test/suite/maria/r/maria-recovery2.result	2009-02-13 16:30:54 +0000
+++ b/mysql-test/suite/maria/r/maria-recovery2.result	2009-03-17 14:53:45 +0000
@@ -28,7 +28,7 @@ ok
 use mysqltest;
 drop table t1;
 * TEST of checkpoint
-set global debug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
+set global debug="+d,maria_checkpoint_indirect";
 set global maria_checkpoint_interval=10000;
 create table t1(a int, b varchar(10), index(a,b)) engine=maria;
 insert into t1 values(1,"a"),(2,"b"),(3,"c");

=== added file 'mysql-test/suite/maria/t/maria-autozerofill-master.opt'
--- a/mysql-test/suite/maria/t/maria-autozerofill-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/maria/t/maria-autozerofill-master.opt	2009-03-17 14:53:45 +0000
@@ -0,0 +1 @@
+--loose-skip-falcon

=== added file 'mysql-test/suite/maria/t/maria-no-logging-master.opt'
--- a/mysql-test/suite/maria/t/maria-no-logging-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/maria/t/maria-no-logging-master.opt	2009-03-17 14:53:45 +0000
@@ -0,0 +1 @@
+--loose-skip-falcon

=== modified file 'mysql-test/suite/maria/t/maria-recovery-bitmap.test'
--- a/mysql-test/suite/maria/t/maria-recovery-bitmap.test	2008-10-20 09:16:47 +0000
+++ b/mysql-test/suite/maria/t/maria-recovery-bitmap.test	2009-03-17 14:53:45 +0000
@@ -44,7 +44,7 @@ insert into t1 values ("bbbbbbb");
 # test).
 insert into t1 values ("bbbbbbb");
 delete from t1 limit 1;
-set session debug="+d,info,enter,exit,maria_over_alloc_bitmap";
+set session debug="+d,maria_over_alloc_bitmap";
 send insert into t1 values ("aaaaaaaaa");
 connection admin;
 # Leave time for INSERT to block after modifying bitmap;

=== modified file 'mysql-test/suite/maria/t/maria-recovery2.test'
--- a/mysql-test/suite/maria/t/maria-recovery2.test	2009-02-13 16:30:54 +0000
+++ b/mysql-test/suite/maria/t/maria-recovery2.test	2009-03-17 14:53:45 +0000
@@ -62,7 +62,7 @@ drop table t1;
 # A basic checkpoint test
 --echo * TEST of checkpoint
 # Don't take a full checkpoints, we want to test checkpoint vs dirty pages
-set global debug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
+set global debug="+d,maria_checkpoint_indirect";
 # restart checkpoint thread for it to notice the above
 set global maria_checkpoint_interval=10000;
 create table t1(a int, b varchar(10), index(a,b)) engine=maria;


Attachment: [text/bzr-bundle] bzr/[e-mail]