bk commit into 5.1 tree (guilhem:1.2181)

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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
  1.2181 06/02/26 21:30:39 guilhem@stripped +1 -0
  var/tmp does not work (same fix as knielsen did for rpl_row_UUID a few days ago)

  mysql-test/t/rpl_switch_stm_row_mixed.test
    1.2 06/02/26 21:30:34 guilhem@stripped +3 -3
    var/tmp does not work if non-default vardir

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-new

--- 1.1/mysql-test/t/rpl_switch_stm_row_mixed.test	2006-02-25 22:20:55 +01:00
+++ 1.2/mysql-test/t/rpl_switch_stm_row_mixed.test	2006-02-26 21:30:34 +01:00
@@ -150,8 +150,8 @@
 show binlog events from 102;
 sync_slave_with_master;
 # as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info
mysqltest1 > ./var/tmp/rpl_row_UDF_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert
--no-create-info mysqltest1 > ./var/tmp/rpl_row_UDF_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info
mysqltest1 > $MYSQLTEST_VARDIR/tmp/rpl_row_UDF_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert
--no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/rpl_row_UDF_slave.sql
 
 connection master;
 drop database mysqltest1;
@@ -162,4 +162,4 @@
 # will be created. You will need to go to the mysql-test dir and diff
 # the files your self to see what is not matching
 
-#--exec diff ./var/tmp/rpl_row_UDF_master.sql ./var/tmp/rpl_row_UDF_slave.sql;
+#--exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_UDF_master.sql
$MYSQLTEST_VARDIR/tmp/rpl_row_UDF_slave.sql;