Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest

into mysql.com:/usr/local/mysql/mysql-5.1-new

Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest
into mysql.com:/usr/local/mysql/mysql-5.1-new
4fc82049 · knielsen@mysql.com · 1e437a1f · c15158e1 · 4fc82049
Commit 4fc82049 authored Feb 20, 2006 by knielsen@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/binlog_stm_mix_innodb_myisam.result mysql-test/r/binlog_stm_mix_innodb_myisam.result +2 -2

No files found.
--- a/mysql-test/r/binlog_stm_mix_innodb_myisam.result
+++ b/mysql-test/r/binlog_stm_mix_innodb_myisam.result
@@ -269,9 +269,9 @@ select get_lock("a",10);
 get_lock("a",10)
 1
 select
-(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))
+(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
 is not null;
-(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))
+(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
 is not null
 1
 select