bk commit into 6.0 tree (cbell:1.2717)

[cbell]

Below is the list of changes that have just been committed into a local
6.0 repository of cbell. When cbell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-06 11:41:49-05:00, cbell@mysql_cab_desk. +4 -0
  Fix mysql-6.0-rpl-merge pushbuild failures
  
  Remove the tests that use get_lock(), BACKUP_BREAKPOINT() and 
  release_lock() from running under valgrind due to timing and macro
  issues.

  mysql-test/t/backup_commit_blocker.test@stripped, 2007-12-06 11:41:42-05:00, cbell@mysql_cab_desk. +1 -0
    Fix mysql-6.0-rpl-merge pushbuild failures
    
    Remove the test from running under valgrind due to timing and macro
    issues.

  mysql-test/t/backup_ddl_blocker.test@stripped, 2007-12-06 11:41:43-05:00, cbell@mysql_cab_desk. +1 -0
    Fix mysql-6.0-rpl-merge pushbuild failures
    
    Remove the test from running under valgrind due to timing and macro
    issues.

  mysql-test/t/backup_progress.test@stripped, 2007-12-06 11:41:44-05:00, cbell@mysql_cab_desk. +1 -0
    Fix mysql-6.0-rpl-merge pushbuild failures
    
    Remove the test from running under valgrind due to timing and macro
    issues.

  mysql-test/t/backup_snapshot.test@stripped, 2007-12-06 11:41:45-05:00, cbell@mysql_cab_desk. +1 -0
    Fix mysql-6.0-rpl-merge pushbuild failures
    
    Remove the test from running under valgrind due to timing and macro
    issues.

diff -Nrup a/mysql-test/t/backup_commit_blocker.test b/mysql-test/t/backup_commit_blocker.test
--- a/mysql-test/t/backup_commit_blocker.test	2007-12-04 12:38:03 -05:00
+++ b/mysql-test/t/backup_commit_blocker.test	2007-12-06 11:41:42 -05:00
@@ -43,6 +43,7 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/not_embedded.inc
+--source include/not_valgrind.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS bup_commit_blocker;
diff -Nrup a/mysql-test/t/backup_ddl_blocker.test b/mysql-test/t/backup_ddl_blocker.test
--- a/mysql-test/t/backup_ddl_blocker.test	2007-12-04 12:38:04 -05:00
+++ b/mysql-test/t/backup_ddl_blocker.test	2007-12-06 11:41:43 -05:00
@@ -52,6 +52,7 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/not_embedded.inc
+--source include/not_valgrind.inc
 
 #
 # Connections used in this test
diff -Nrup a/mysql-test/t/backup_progress.test b/mysql-test/t/backup_progress.test
--- a/mysql-test/t/backup_progress.test	2007-12-04 12:38:04 -05:00
+++ b/mysql-test/t/backup_progress.test	2007-12-06 11:41:44 -05:00
@@ -7,6 +7,7 @@ source include/have_log_bin.inc;
 source include/have_debug.inc;
 source include/have_innodb.inc;
 source include/not_embedded.inc;
+source include/not_valgrind.inc;
 
 --disable_warnings
 DROP DATABASE IF EXISTS backup_progress;
diff -Nrup a/mysql-test/t/backup_snapshot.test b/mysql-test/t/backup_snapshot.test
--- a/mysql-test/t/backup_snapshot.test	2007-12-04 12:38:06 -05:00
+++ b/mysql-test/t/backup_snapshot.test	2007-12-06 11:41:45 -05:00
@@ -29,6 +29,7 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/not_embedded.inc
+--source include/not_valgrind.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS bup_snapshot;