bk commit into 5.1 tree (skozlov:1.2554)

[Serge Kozlov]

Below is the list of changes that have just been committed into a local
5.1 repository of ksm. When ksm 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-08-15 15:51:27+04:00, skozlov@stripped +2 -0
  disabled rpl_innodb_mixed_dml

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@stripped, 2007-08-15 15:51:18+04:00, skozlov@stripped +1 -1
    fix for tmp directory

  mysql-test/suite/rpl/t/disabled.def@stripped, 2007-08-15 15:51:18+04:00, skozlov@stripped +1 -1
    disabled rpl_innodb_mixed_dml

diff -Nrup a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc
--- a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc	2007-08-15 14:53:05 +04:00
+++ b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc	2007-08-15 15:51:18 +04:00
@@ -53,7 +53,7 @@ DELETE FROM t2 WHERE a = 2;
 --echo ******************** LOAD DATA INFILE ********************
 --exec cp ./suite/rpl/data/rpl_mixed.dat $MYSQLTEST_VARDIR/tmp/
 LOAD DATA INFILE '../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;
---exec rm ./var/tmp/rpl_mixed.dat
+--exec rm $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat
 SELECT * FROM t1;
 --source suite/rpl/include/rpl_mixed_check_select.inc
 --source suite/rpl/include/rpl_mixed_clear_tables.inc
diff -Nrup a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
--- a/mysql-test/suite/rpl/t/disabled.def	2007-08-03 14:44:41 +04:00
+++ b/mysql-test/suite/rpl/t/disabled.def	2007-08-15 15:51:18 +04:00
@@ -12,7 +12,7 @@
 
 rpl_ddl                  : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
 #rpl_innodb_mixed_ddl     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
-#rpl_innodb_mixed_dml     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
+rpl_innodb_mixed_dml     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
 rpl_invoked_features     : BUG#29020 2007-06-21 Lars Non-deterministic test case
 rpl_auto_increment_11932   : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file
 rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported.