List:Commits« Previous MessageNext Message »
From:msvensson Date:January 24 2006 1:10pm
Subject:bk commit into 5.1 tree (msvensson:1.2072)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2072 06/01/24 14:10:48 msvensson@neptunus.(none) +54 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
  into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var

  mysql-test/t/trigger-grant.test
    1.4 06/01/24 14:10:44 msvensson@neptunus.(none) +1 -1
    Merge 5.0 -> 5.1

  mysql-test/t/trigger-compat.test
    1.4 06/01/24 14:10:44 msvensson@neptunus.(none) +1 -1
    Merge 5.0 -> 5.1

  mysql-test/t/rpl_timezone.test
    1.14 06/01/24 14:10:44 msvensson@neptunus.(none) +3 -6
    Merge 5.0 -> 5.1

  mysql-test/t/rpl_loaddata_m.test
    1.16 06/01/24 14:10:44 msvensson@neptunus.(none) +0 -1
    Merge 5.0 -> 5.1

  mysql-test/t/rpl_loaddata.test
    1.23 06/01/24 14:10:44 msvensson@neptunus.(none) +0 -7
    Merge 5.0 -> 5.1

  mysql-test/t/rpl_drop_db.test
    1.8 06/01/24 14:10:44 msvensson@neptunus.(none) +1 -2
    Merge 5.0 -> 5.1

  mysql-test/t/mysqltest.test
    1.32 06/01/24 14:10:44 msvensson@neptunus.(none) +5 -20
    Merge 5.0 -> 5.1

  mysql-test/t/mysqlbinlog2.test
    1.9 06/01/24 14:10:44 msvensson@neptunus.(none) +4 -8
    Merge 5.0 -> 5.1

  mysql-test/t/mysqlbinlog.test
    1.23 06/01/24 14:10:44 msvensson@neptunus.(none) +2 -4
    Merge 5.0 -> 5.1

  mysql-test/r/rpl_timezone.result
    1.17 06/01/24 14:10:44 msvensson@neptunus.(none) +1 -2
    Merge 5.0 -> 5.1

  mysql-test/r/rpl_stm_log.result
    1.64 06/01/24 14:10:44 msvensson@neptunus.(none) +3 -11
    Merge 5.0 -> 5.1

  mysql-test/r/rpl_loaddata_m.result
    1.18 06/01/24 14:10:44 msvensson@neptunus.(none) +0 -2
    Merge 5.0 -> 5.1

  mysql-test/r/rpl_loaddata.result
    1.30 06/01/24 14:10:44 msvensson@neptunus.(none) +0 -1
    Merge 5.0 -> 5.1

  mysql-test/r/mysqltest.result
    1.27 06/01/24 14:10:44 msvensson@neptunus.(none) +0 -0
    Merge 5.0 -> 5.1

  mysql-test/r/binlog_stm_blackhole.result
    1.9 06/01/24 14:10:44 msvensson@neptunus.(none) +0 -0
    Merge 5.0 -> 5.1

  mysql-test/mysql-test-run.pl
    1.58 06/01/24 14:10:44 msvensson@neptunus.(none) +1 -1
    Merge 5.0 -> 5.1

  mysql-test/t/warnings.test
    1.24 06/01/24 13:56:47 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/view.test
    1.134 06/01/24 13:56:47 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/user_var-binlog.test
    1.5 06/01/24 13:56:47 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/trigger.test
    1.33 06/01/24 13:56:47 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/symlink.test
    1.19 06/01/24 13:56:47 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/sp-destruct.test
    1.6 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.62 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.test
    1.65 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_rewrt_db.test
    1.7 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_replicate_do.test
    1.24 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata_s.test
    1.11 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flushlog_loop-slave.sh
    1.5 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flushlog_loop-slave.opt
    1.6 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flushlog_loop-master.sh
    1.5 06/01/24 13:56:46 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flushlog_loop-master.opt
    1.6 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_000015-slave.sh
    1.5 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.55 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/ndb_autodiscover.test
    1.24 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.79 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/loaddata.test
    1.17 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/backup.test
    1.19 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/warnings.result
    1.38 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/view.result
    1.146 06/01/24 13:56:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/trigger.result
    1.28 06/01/24 13:56:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_stm_000001.result
    1.32 06/01/24 13:56:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_rewrt_db.result
    1.8 06/01/24 13:56:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_replicate_do.result
    1.32 06/01/24 13:56:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_loaddata_s.result
    1.9 06/01/24 13:56:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.70 06/01/24 13:56:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/loaddata.result
    1.23 06/01/24 13:56:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/backup.result
    1.13 06/01/24 13:56:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/extra/rpl_tests/rpl_stm_charset.test
    1.18 06/01/24 13:56:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/extra/rpl_tests/rpl_stm_000001.test
    1.44 06/01/24 13:56:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/extra/rpl_tests/rpl_log.test
    1.29 06/01/24 13:56:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/extra/rpl_tests/rpl_EE_err.test
    1.13 06/01/24 13:56:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
    1.7 06/01/24 13:56:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/extra/binlog_tests/blackhole.test
    1.7 06/01/24 13:56:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_rewrt_db.test
    1.4.1.2 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_rewrite_db.test -> mysql-test/t/rpl_rewrt_db.test

  mysql-test/r/rpl_stm_log.result
    1.62.1.2 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/r/rpl_log.result -> mysql-test/r/rpl_stm_log.result

  mysql-test/r/rpl_rewrt_db.result
    1.4.1.2 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/r/rpl_rewrite_db.result -> mysql-test/r/rpl_rewrt_db.result

  mysql-test/r/rpl_loaddata_s.result
    1.7.1.2 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/r/rpl_loaddata_rule_s.result -> mysql-test/r/rpl_loaddata_s.result

  mysql-test/r/rpl_loaddata_m.result
    1.13.1.2 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/r/rpl_loaddata_rule_m.result -> mysql-test/r/rpl_loaddata_m.result

  mysql-test/mysql-test-run.sh
    1.293 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/extra/rpl_tests/rpl_stm_000001.test
    1.41.1.2 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl000001.test -> mysql-test/extra/rpl_tests/rpl_stm_000001.test

  mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
    1.5.1.2 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/ctype_ucs_binlog.test -> mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

  mysql-test/extra/binlog_tests/blackhole.test
    1.4.1.2 06/01/24 13:56:42 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/blackhole.test -> mysql-test/extra/binlog_tests/blackhole.test

  mysql-test/t/rpl_loaddata_s.test
    1.9.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_loaddata_rule_s.test -> mysql-test/t/rpl_loaddata_s.test

  mysql-test/t/rpl_loaddata_m.test
    1.12.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_loaddata_rule_m.test -> mysql-test/t/rpl_loaddata_m.test

  mysql-test/t/rpl_flushlog_loop-slave.sh
    1.3.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_flush_log_loop-slave.sh -> mysql-test/t/rpl_flushlog_loop-slave.sh

  mysql-test/t/rpl_flushlog_loop-slave.opt
    1.4.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_flush_log_loop-slave.opt -> mysql-test/t/rpl_flushlog_loop-slave.opt

  mysql-test/t/rpl_flushlog_loop-master.sh
    1.3.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_flush_log_loop-master.sh -> mysql-test/t/rpl_flushlog_loop-master.sh

  mysql-test/t/rpl_flushlog_loop-master.opt
    1.4.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_flush_log_loop-master.opt -> mysql-test/t/rpl_flushlog_loop-master.opt

  mysql-test/t/rpl_000015-slave.sh
    1.3.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl000015-slave.sh -> mysql-test/t/rpl_000015-slave.sh

  mysql-test/r/rpl_stm_000001.result
    1.29.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/r/rpl000001.result -> mysql-test/r/rpl_stm_000001.result

  mysql-test/r/binlog_stm_blackhole.result
    1.5.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/r/blackhole.result -> mysql-test/r/binlog_stm_blackhole.result

  mysql-test/extra/rpl_tests/rpl_stm_charset.test
    1.16.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_charset.test -> mysql-test/extra/rpl_tests/rpl_stm_charset.test

  mysql-test/extra/rpl_tests/rpl_log.test
    1.27.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_log.test -> mysql-test/extra/rpl_tests/rpl_log.test

  mysql-test/extra/rpl_tests/rpl_EE_err.test
    1.9.1.2 06/01/24 13:56:41 msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/t/rpl_EE_error.test -> mysql-test/extra/rpl_tests/rpl_EE_err.test

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var/RESYNC

--- 1.292/mysql-test/mysql-test-run.sh	2006-01-23 12:31:46 +01:00
+++ 1.293/mysql-test/mysql-test-run.sh	2006-01-24 13:56:42 +01:00
@@ -185,7 +185,8 @@
 cd $CWD
 MYSQL_TEST_DIR=$BASEDIR/mysql-test
 MYSQL_TEST_WINDIR=$MYSQL_TEST_DIR
-export MYSQL_TEST_DIR MYSQL_TEST_WINDIR
+MYSQLTEST_VARDIR=$MYSQL_TEST_DIR/var
+export MYSQL_TEST_DIR MYSQL_TEST_WINDIR MYSQLTEST_VARDIR
 STD_DATA=$MYSQL_TEST_DIR/std_data
 hostname=`hostname`		# Installed in the mysql privilege table
 

--- 1.3/mysql-test/t/trigger-compat.test	2005-12-14 21:39:15 +01:00
+++ 1.4/mysql-test/t/trigger-compat.test	2006-01-24 14:10:44 +01:00
@@ -61,8 +61,8 @@
 --echo
 --echo ---> patching t1.TRG...
 
---exec grep -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
---exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG
+--exec grep -v 'definers=' $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG > $MYSQLTEST_VARDIR/tmp/t1.TRG
+--exec mv $MYSQLTEST_VARDIR/tmp/t1.TRG $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG
 
 #
 # Create a new trigger.

--- 1.3/mysql-test/t/trigger-grant.test	2005-12-14 21:39:15 +01:00
+++ 1.4/mysql-test/t/trigger-grant.test	2006-01-24 14:10:44 +01:00
@@ -449,9 +449,9 @@
   FOR EACH ROW
     SET @a = 5;
 
---exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
---exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG
---exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG
+--exec egrep -v '^definers=' $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG > $MYSQLTEST_VARDIR/tmp/t1.TRG
+--exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQLTEST_VARDIR/tmp/t1.TRG
+--exec mv $MYSQLTEST_VARDIR/tmp/t1.TRG $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG
 
 --echo
 

--- 1.145/mysql-test/r/view.result	2006-01-19 10:28:59 +01:00
+++ 1.146/mysql-test/r/view.result	2006-01-24 13:56:45 +01:00
@@ -1293,7 +1293,7 @@
 drop table t1;
 create table t1 (a int, b char(10));
 create view v1 as select * from t1 where a != 0 with check option;
-load data infile '../../std_data/loaddata3.dat' into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
+load data infile '../std_data_ln/loaddata3.dat' into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 select * from t1;
 a	b
@@ -1304,7 +1304,7 @@
 1	row 1
 2	row 2
 delete from t1;
-load data infile '../../std_data/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
+load data infile '../std_data_ln/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 3
 Error	1369	CHECK OPTION failed 'test.v1'
@@ -1324,14 +1324,14 @@
 drop table t1;
 create table t1 (a text, b text);
 create view v1 as select * from t1 where a <> 'Field A' with check option;
-load data infile '../../std_data/loaddata2.dat' into table v1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table v1 fields terminated by ',' enclosed by '''';
 ERROR HY000: CHECK OPTION failed 'test.v1'
 select concat('|',a,'|'), concat('|',b,'|') from t1;
 concat('|',a,'|')	concat('|',b,'|')
 select concat('|',a,'|'), concat('|',b,'|') from v1;
 concat('|',a,'|')	concat('|',b,'|')
 delete from t1;
-load data infile '../../std_data/loaddata2.dat' ignore into table v1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' ignore into table v1 fields terminated by ',' enclosed by '''';
 Warnings:
 Error	1369	CHECK OPTION failed 'test.v1'
 Warning	1261	Row 2 doesn't contain data for all columns

--- 1.133/mysql-test/t/view.test	2006-01-19 10:28:59 +01:00
+++ 1.134/mysql-test/t/view.test	2006-01-24 13:56:47 +01:00
@@ -1221,11 +1221,11 @@
 create table t1 (a int, b char(10));
 create view v1 as select * from t1 where a != 0 with check option;
 -- error 1369
-load data infile '../../std_data/loaddata3.dat' into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
+load data infile '../std_data_ln/loaddata3.dat' into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
 select * from t1;
 select * from v1;
 delete from t1;
-load data infile '../../std_data/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
+load data infile '../std_data_ln/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
 select * from t1;
 select * from v1;
 drop view v1;
@@ -1234,11 +1234,11 @@
 create table t1 (a text, b text);
 create view v1 as select * from t1 where a <> 'Field A' with check option;
 -- error 1369
-load data infile '../../std_data/loaddata2.dat' into table v1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table v1 fields terminated by ',' enclosed by '''';
 select concat('|',a,'|'), concat('|',b,'|') from t1;
 select concat('|',a,'|'), concat('|',b,'|') from v1;
 delete from t1;
-load data infile '../../std_data/loaddata2.dat' ignore into table v1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' ignore into table v1 fields terminated by ',' enclosed by '''';
 select concat('|',a,'|'), concat('|',b,'|') from t1;
 select concat('|',a,'|'), concat('|',b,'|') from v1;
 drop view v1;

--- 1.5.1.1/mysql-test/r/blackhole.result	2006-01-24 08:30:46 +01:00
+++ 1.9/mysql-test/r/binlog_stm_blackhole.result	2006-01-24 14:10:44 +01:00
@@ -110,16 +110,42 @@
 master-bin.000001	#	Query	1	#	use `test`; drop table t1,t2
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=blackhole
 master-bin.000001	#	Query	1	#	use `test`; delete from t1 where a=10
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; update t1 set a=11 where a=15
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1)
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; insert ignore into t1 values(1)
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; replace into t1 values(100)
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200)) engine=blackhole
 master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/words.dat' into table t2 ;file_id=1
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int
 master-bin.000001	#	Query	1	#	use `test`; alter table t1 drop b
 master-bin.000001	#	Query	1	#	use `test`; create table t3 like t1
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t3
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; replace into t1 select * from t3
+master-bin.000001	#	Query	1	#	use `test`; COMMIT
 drop table t1,t2,t3;
+reset master;
+create table t1 (a int) engine=blackhole;
+set autocommit=0;
+start transaction;
+insert into t1 values(1);
+commit;
+start transaction;
+insert into t1 values(2);
+rollback;
+set autocommit=1;
+show binlog events;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=blackhole
+master-bin.000001	#	Query	1	#	use `test`; BEGIN
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1)
+master-bin.000001	#	Query	1	#	use `test`; COMMIT

--- 1.4.1.1/mysql-test/t/blackhole.test	2006-01-24 08:30:47 +01:00
+++ 1.7/mysql-test/extra/binlog_tests/blackhole.test	2006-01-24 13:56:43 +01:00
@@ -127,3 +127,20 @@
 drop table t1,t2,t3;
 
 # End of 4.1 tests
+
+# Test that a transaction which is rolled back does not go into binlog
+# and that a transaction which is committed does
+
+reset master;
+create table t1 (a int) engine=blackhole;
+set autocommit=0;
+start transaction;
+insert into t1 values(1);
+commit;
+start transaction;
+insert into t1 values(2);
+rollback;
+set autocommit=1;
+--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
+show binlog events;

--- 1.16/mysql-test/r/rpl_timezone.result	2006-01-18 00:43:22 +01:00
+++ 1.17/mysql-test/r/rpl_timezone.result	2006-01-24 14:10:44 +01:00
@@ -41,7 +41,7 @@
 2004-06-11 09:39:02	6
 delete from t1;
 set time_zone='UTC';
-load data infile '../../std_data/rpl_timezone2.dat' into table t1;
+load data infile '../std_data_ln/rpl_timezone2.dat' into table t1;
 Warnings:
 Warning	1265	Data truncated for column 't' at row 1
 Warning	1261	Row 1 doesn't contain data for all columns

--- 1.13/mysql-test/t/rpl_timezone.test	2006-01-18 00:43:31 +01:00
+++ 1.14/mysql-test/t/rpl_timezone.test	2006-01-24 14:10:44 +01:00
@@ -56,15 +56,15 @@
 # Change Author: JBM
 # Change Date: 2005-12-22
 # Change: Comment out the exec of the binlog so test works for both SBR and RBR
-#--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-#--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001
+#--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+#--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001
 
 # Let us check with LOAD DATA INFILE
 # (we do it after mysqlbinlog because the temp files names are not constant)
 connection master;
 delete from t1;
 set time_zone='UTC';
-load data infile '../../std_data/rpl_timezone2.dat' into table t1;
+load data infile '../std_data_ln/rpl_timezone2.dat' into table t1;
 SELECT * FROM t1 ORDER BY n;
 sync_slave_with_master;
 set time_zone='UTC';

--- 1.27/mysql-test/r/trigger.result	2006-01-12 01:02:48 +01:00
+++ 1.28/mysql-test/r/trigger.result	2006-01-24 13:56:44 +01:00
@@ -404,13 +404,13 @@
 create trigger trg1 before insert on t1 for each row set new.k = new.i;
 create trigger trg2 after insert on t1 for each row set @b:= "Fired";
 set @b:="";
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, i);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, i);
 select *, @b from t1;
 i	j	k	@b
 10	NULL	10	Fired
 15	NULL	15	Fired
 set @b:="";
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j);
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j);
 select *, @b from t1;
 i	j	k	@b
 10	NULL	10	Fired
@@ -447,7 +447,7 @@
 select * from t1;
 i	k
 1	1
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k);
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k);
 ERROR 42S22: Unknown column 'at' in 'NEW'
 select * from t1;
 i	k
@@ -528,7 +528,7 @@
 i	k
 1	1
 2	2
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k);
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k);
 ERROR 42S22: Unknown column 'bt' in 'NEW'
 select * from t1;
 i	k

--- 1.22/mysql-test/t/mysqlbinlog.test	2005-12-22 05:10:54 +01:00
+++ 1.23/mysql-test/t/mysqlbinlog.test	2006-01-24 14:10:44 +01:00
@@ -24,11 +24,11 @@
 
 # test for load data and load data distributed among the several 
 # files (we need to fill up first binlog)
-load data infile '../../std_data/words.dat' into table t1;
-load data infile '../../std_data/words.dat' into table t1;
-load data infile '../../std_data/words.dat' into table t1;
-load data infile '../../std_data/words.dat' into table t1;
-load data infile '../../std_data/words.dat' into table t1;
+load data infile '../std_data_ln/words.dat' into table t1;
+load data infile '../std_data_ln/words.dat' into table t1;
+load data infile '../std_data_ln/words.dat' into table t1;
+load data infile '../std_data_ln/words.dat' into table t1;
+load data infile '../std_data_ln/words.dat' into table t1;
 # simple query to show more in second binlog
 insert into t1 values ("Alas");
 flush logs;
@@ -43,29 +43,29 @@
 # be time dependend. Better than nothing.
 #
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000001 
 
 # this should not fail but shouldn't produce any working statements
 --disable_query_log
 select "--- Broken LOAD DATA --" as "";
 --enable_query_log
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ $MYSQL_TEST_DIR/var/log/master-bin.000002
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000002
 
 # this should show almost nothing
 --disable_query_log
 select "--- --database --" as "";
 --enable_query_log
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --database=nottest $MYSQL_TEST_DIR/var/log/master-bin.000001
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLTEST_VARDIR/log/master-bin.000001
 
 # this test for position option
 --disable_query_log
 select "--- --position --" as "";
 --enable_query_log
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=235 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=235 $MYSQLTEST_VARDIR/log/master-bin.000002
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
@@ -75,29 +75,29 @@
 --enable_query_log
 
 # This is broken now
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
 
 # This is broken too
 --disable_query_log
 select "--- Broken LOAD DATA --" as "";
 --enable_query_log
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
 
 # And this too ! (altough it is documented)
 --disable_query_log
 select "--- --database --" as "";
 --enable_query_log
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001
 
 # Strangely but this works
 --disable_query_log
 select "--- --position --" as "";
 --enable_query_log
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=235 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=235 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
 
 # Bug#7853 (mysqlbinlog does not accept input from stdin)
 --disable_query_log

--- 1.32/mysql-test/t/trigger.test	2006-01-05 23:49:22 +01:00
+++ 1.33/mysql-test/t/trigger.test	2006-01-24 13:56:47 +01:00
@@ -465,11 +465,11 @@
 create trigger trg2 after insert on t1 for each row set @b:= "Fired"; 
 set @b:="";
 # Test triggers with file with separators
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, i);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, i);
 select *, @b from t1;
 set @b:="";
 # Test triggers with fixed size row file
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j);
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j);
 select *, @b from t1;
 # This also will drop triggers
 drop table t1;
@@ -503,7 +503,7 @@
 select * from t1;
 # Should fail and insert only 1 row
 --error 1054
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k);
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k);
 select * from t1;
 --error 1054
 insert into t1 select 3, 3;
@@ -563,7 +563,7 @@
 delete from t1;
 select * from t1;
 --error 1054
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k);
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k);
 select * from t1;
 --error 1054
 insert into t1 select 3, 3;

--- 1.13.1.1/mysql-test/r/rpl_loaddata_rule_m.result	2006-01-24 08:30:46 +01:00
+++ 1.18/mysql-test/r/rpl_loaddata_m.result	2006-01-24 14:10:44 +01:00
@@ -5,15 +5,35 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 drop database if exists mysqltest;
-stop slave;
-create database mysqltest;
-create table t1(a int, b int, unique(b));
-use mysqltest;
-load data infile '../std_data_ln/rpl_loaddata.dat' into table test.t1;
-show binlog events from 98;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	drop database if exists mysqltest
-master-bin.000001	#	Query	1	#	create database mysqltest
-master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=12
-master-bin.000001	#	Execute_load_query	1	#	use `mysqltest`; load data infile '../std_data_ln/rpl_loaddata.dat' into table test.t1 ;file_id=1
-drop database mysqltest;
+USE test;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;
+SELECT COUNT(*) FROM test.t1;
+COUNT(*)
+2
+CREATE DATABASE mysqltest;
+USE mysqltest;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
+SELECT COUNT(*) FROM mysqltest.t1;
+COUNT(*)
+2
+SHOW DATABASES;
+Database
+information_schema
+cluster_replication
+mysql
+mysqltest
+test
+USE test;
+SHOW TABLES;
+Tables_in_test
+USE mysqltest;
+SHOW TABLES;
+Tables_in_mysqltest
+t1
+SELECT COUNT(*) FROM mysqltest.t1;
+COUNT(*)
+2
+DROP DATABASE mysqltest;
+DROP TABLE test.t1;

--- 1.7.1.1/mysql-test/r/rpl_loaddata_rule_s.result	2006-01-24 08:30:46 +01:00
+++ 1.9/mysql-test/r/rpl_loaddata_s.result	2006-01-24 13:56:44 +01:00
@@ -5,10 +5,10 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 reset master;
-create table t1(a int, b int, unique(b));
+create table test.t1(a int, b int, unique(b));
 load data infile '../std_data_ln/rpl_loaddata.dat' into table test.t1;
-select count(*) from t1;
+select count(*) from test.t1;
 count(*)
 2
-show binlog events from 98;
+show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

--- 1.4.1.1/mysql-test/r/rpl_rewrite_db.result	2006-01-24 08:30:47 +01:00
+++ 1.8/mysql-test/r/rpl_rewrt_db.result	2006-01-24 13:56:44 +01:00
@@ -67,9 +67,9 @@
 create table t1 (a int, b char(10));
 load data infile '../std_data_ln/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 Warning	1262	Row 3 was truncated; it contained more data than there were input columns
-Warning	1264	Out of range value adjusted for column 'a' at row 5
+Warning	1264	Out of range value for column 'a' at row 5
 Warning	1262	Row 5 was truncated; it contained more data than there were input columns
 select * from rewrite.t1;
 a	b
@@ -81,7 +81,7 @@
 truncate table t1;
 load data infile '../std_data_ln/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 Warning	1261	Row 4 doesn't contain data for all columns
 select * from rewrite.t1;
 a	b

--- 1.8/mysql-test/t/mysqlbinlog2.test	2005-12-22 05:10:55 +01:00
+++ 1.9/mysql-test/t/mysqlbinlog2.test	2006-01-24 14:10:44 +01:00
@@ -43,28 +43,28 @@
 # be time dependent (the Start events). Better than nothing.
 #
 
---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 
 
 --disable_query_log
 select "--- offset --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --offset=2 $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --offset=2 $MYSQLTEST_VARDIR/log/master-bin.000001 
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=604 $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --start-position=604 $MYSQLTEST_VARDIR/log/master-bin.000001 
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=604 $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --stop-position=604 $MYSQLTEST_VARDIR/log/master-bin.000001 
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 
 --disable_query_log
 select "--- stop-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 
 
 --disable_query_log
 select "--- Local with 2 binlogs on command line --" as "";
@@ -72,28 +72,28 @@
 
 # This is to verify that some options apply only to first, or last binlog
 
---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
 
 --disable_query_log
 select "--- offset --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --offset=2 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --offset=2 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=604 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --start-position=604 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=130 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --stop-position=130 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
 --disable_query_log
 select "--- stop-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
 
 --disable_query_log
 select "--- Remote --" as "";

--- 1.9.1.1/mysql-test/t/rpl_EE_error.test	2006-01-24 08:30:48 +01:00
+++ 1.13/mysql-test/extra/rpl_tests/rpl_EE_err.test	2006-01-24 13:56:43 +01:00
@@ -1,32 +1,29 @@
+# The test is not relevant when testing replication of error codes for
+# statements that are not replicated.  The test below could be changed
+# to rely on the replication of error codes for statements that are not
+# replicated row-based.
+#
 # See if an EE_ error in one event of the master's binlog stops replication
 # (it should not: in this configuration the EE_ error is probably not 
 # critical). Example: you do a DROP TABLE on a table which has no MYI file
 # check if START SLAVE, RESET SLAVE, CHANGE MASTER reset Last_slave_error and
 # Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986).
+####################################
+# Change Author: JBM
+# Change Date: 2006-01-11
+# Change: Split test per lars review
+####################################
+#"REQUIREMENT: A master DROP TABLE on a table with non-existing MYI
+# file must be correctly replicated to the slave"
+####################################
+-- source include/master-slave.inc
 
-source include/master-slave.inc;
-
-create table t1 (a int) engine=myisam;
+eval create table t1 (a int) engine=$engine_type;
 flush tables;
 system rm $MYSQLTEST_VARDIR/master-data/test/t1.MYI ;
 drop table if exists t1;
 save_master_pos;
 connection slave;
 sync_with_master;
-
-# Now a real error.
-
-connection master;
-create table t1 (a int, unique(a)) engine=myisam;
-set sql_log_bin=0;
-insert into t1 values(2);
-set sql_log_bin=1;
-save_master_pos;
---error 1062
-insert into t1 values(1),(2);
-drop table t1;
-save_master_pos;
-connection slave;
-wait_for_slave_to_stop;
 
 # End of 4.1 tests

--- 1.16.1.1/mysql-test/t/rpl_charset.test	2006-01-24 08:30:48 +01:00
+++ 1.18/mysql-test/extra/rpl_tests/rpl_stm_charset.test	2006-01-24 13:56:43 +01:00
@@ -1,6 +1,9 @@
 # Replication of character sets.
 # This test will fail if the server/client does not support enough charsets.
 
+# Requires statement logging
+-- source include/have_binlog_format_statement.inc
+
 source include/master-slave.inc;
 --disable_warnings
 set timestamp=1000000000;
@@ -107,7 +110,7 @@
 drop database mysqltest2;
 drop database mysqltest3;
 --replace_column 2 # 5 #
-show binlog events from 98;
+show binlog events from 102;
 sync_slave_with_master;
 
 # Check that we can change global.collation_server (since 5.0.3)
@@ -161,10 +164,10 @@
 #  BUG#6676: Derivation of variables must be correct on slave
 #
 connection master;
-create table `t1` (
+eval create table `t1` (
   `pk` varchar(10) not null default '', 
   primary key (`pk`)
-) engine=myisam default charset=latin1;
+) engine=$engine_type default charset=latin1;
 set @p=_latin1 'test';
 update t1 set pk='test' where pk=@p;
 drop table t1;

--- 1.12.1.1/mysql-test/t/rpl_loaddata_rule_m.test	2006-01-24 08:30:48 +01:00
+++ 1.16/mysql-test/t/rpl_loaddata_m.test	2006-01-24 14:10:44 +01:00
@@ -1,30 +1,49 @@
 # See if the master logs LOAD DATA INFILE correctly when binlog_*_db rules
 # exist.
 # This is for BUG#1100 (LOAD DATA INFILE was half-logged).
-
-source include/master-slave.inc;
+######################################################
+# Change Author: JBM
+# Change Date: 2005-12-22
+# Change: Test rewritten to remove show binlog events
+#         and to test the option better + Cleanup
+######################################################
+-- source include/master-slave.inc
 
 --disable_warnings
 drop database if exists mysqltest;
 --enable_warnings
 
+connection master;
+# 'test' database should be ignored by the slave
+USE test;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;
+SELECT COUNT(*) FROM test.t1;
+
+# 'mysqltest' database should NOT be ignored by the slave
+CREATE DATABASE mysqltest;
+USE mysqltest;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
+SELECT COUNT(*) FROM mysqltest.t1;
+
+# Now lets check the slave to see what we have :-)
+save_master_pos;
 connection slave;
-stop slave; # don't need slave for this test
+sync_with_master;
+
+SHOW DATABASES;
+
+USE test;
+SHOW TABLES;
 
-# Test logging on master
+USE mysqltest;
+SHOW TABLES;
+SELECT COUNT(*) FROM mysqltest.t1;
 
+#show binlog events;
 connection master;
-# 'test' is the current database
-create database mysqltest;
-create table t1(a int, b int, unique(b));
-use mysqltest;
-load data infile '../std_data_ln/rpl_loaddata.dat' into table test.t1;
-# Starting from 5.0.3 LOAD DATA is replicated much in the same way as ordinary
-# query so "show binlog ..." should show two events (before 5.0.3 no events
-# were returned).
---replace_column 2 # 5 #
-show binlog events from 98;
-drop database mysqltest;
+DROP DATABASE mysqltest;
+DROP TABLE test.t1;
 
-# End of 4.1 tests
-# Adding comment for force manual merge 5.0 -> wl1012: Delete me
+# End of test

--- 1.9.1.1/mysql-test/t/rpl_loaddata_rule_s.test	2006-01-24 08:30:48 +01:00
+++ 1.11/mysql-test/t/rpl_loaddata_s.test	2006-01-24 13:56:46 +01:00
@@ -2,13 +2,16 @@
 # replicated LOAD DATA INFILE correctly when it has binlog_*_db rules.
 # This is for BUG#1100 (LOAD DATA INFILE was half-logged).
 
-source include/master-slave.inc;
+-- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
+
 connection slave;
+# Not sure why we connect to slave and then try to reset master, but I will leave it [JBM]
 reset master;
 
 connection master;
 # 'test' is the current database
-create table t1(a int, b int, unique(b));
+create table test.t1(a int, b int, unique(b));
 load data infile '../std_data_ln/rpl_loaddata.dat' into table test.t1;
 
 # Test logging on slave;
@@ -16,7 +19,6 @@
 save_master_pos;
 connection slave;
 sync_with_master;
-select count(*) from t1; # check that LOAD was replicated
-show binlog events from 98; # should be nothing
-
-# End of 4.1 tests
+select count(*) from test.t1; # check that LOAD was replicated
+--replace_column 2 # 5 #
+show binlog events from 102; # should be nothing

--- 1.4.1.1/mysql-test/t/rpl_rewrite_db.test	2006-01-24 08:30:49 +01:00
+++ 1.7/mysql-test/t/rpl_rewrt_db.test	2006-01-24 13:56:46 +01:00
@@ -1,4 +1,7 @@
-source include/master-slave.inc;
+# TBF - difference in row level logging
+-- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
+
 --disable_warnings
 drop database if exists mysqltest1;
 --enable_warnings

--- 1.5.1.1/mysql-test/t/ctype_ucs_binlog.test	2006-01-24 08:30:47 +01:00
+++ 1.7/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test	2006-01-24 13:56:43 +01:00
@@ -9,7 +9,7 @@
 set @v=convert('abc' using ucs2);
 reset master;
 insert into t2 values (@v);
-show binlog events from 98;
+show binlog events from 102;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).

--- 1.4/mysql-test/t/user_var-binlog.test	2005-12-22 05:10:53 +01:00
+++ 1.5/mysql-test/t/user_var-binlog.test	2006-01-24 13:56:47 +01:00
@@ -19,7 +19,7 @@
 # absolutely need variables names to be quoted and strings to be
 # escaped).
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 
 drop table t1;
 
 # End of 4.1 tests

--- 1.57/mysql-test/mysql-test-run.pl	2006-01-23 12:31:46 +01:00
+++ 1.58/mysql-test/mysql-test-run.pl	2006-01-24 14:10:44 +01:00
@@ -76,6 +76,7 @@
 #require 5.6.1;
 use File::Path;
 use File::Basename;
+use File::Copy;
 use Cwd;
 use Getopt::Long;
 use Sys::Hostname;
@@ -156,7 +157,6 @@
 our $path_language;
 our $path_timefile;
 our $path_manager_log;           # Used by mysqldadmin
-our $path_mysqltest_log;
 our $path_slave_load_tmpdir;     # What is this?!
 our $path_my_basedir;
 our $opt_vardir;                 # A path but set directly on cmd line
@@ -482,9 +482,6 @@
   $glob_basedir=         dirname($glob_mysql_test_dir);
   $glob_mysql_bench_dir= "$glob_basedir/mysql-bench"; # FIXME make configurable
 
-  # needs to be same length to test logging (FIXME what???)
-  $path_slave_load_tmpdir=  "../../var/tmp";
-
   $path_my_basedir=
     $opt_source_dist ? $glob_mysql_test_dir : $glob_basedir;
 
@@ -1114,6 +1111,7 @@
   $ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;
   $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;
   $ENV{'MYSQL_TEST_WINDIR'}=  $glob_mysql_test_dir;
+  $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
   $ENV{'MASTER_MYSOCK'}=      $master->[0]->{'path_mysock'};
   $ENV{'MASTER_WINMYSOCK'}=   $master->[0]->{'path_mysock'};
   $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_mysock'};
@@ -1217,10 +1215,40 @@
 
   mtr_report("Removing Stale Files");
 
-  rmtree("$opt_vardir/log");
-  rmtree("$opt_vardir/ndbcluster-$opt_ndbcluster_port");
-  rmtree("$opt_vardir/run");
-  rmtree("$opt_vardir/tmp");
+  if ( $opt_vardir eq "$glob_mysql_test_dir/var" )
+  {
+    #
+    # Running with "var" in mysql-test dir
+    #
+    if ( -l "$glob_mysql_test_dir/var" )
+    {
+      # Some users creates a soft link in mysql-test/var to another area
+      # - allow it
+      mtr_report("WARNING: Using the 'mysql-test/var' symlink");
+      rmtree("$opt_vardir/log");
+      rmtree("$opt_vardir/ndbcluster-$opt_ndbcluster_port");
+      rmtree("$opt_vardir/run");
+      rmtree("$opt_vardir/tmp");
+    }
+    else
+    {
+      # Remove the entire "var" dir
+      rmtree("$opt_vardir/");
+    }
+  }
+  else
+  {
+    #
+    # Running with "var" in some other place
+    #
+
+    # Remove the var/ dir in mysql-test dir if any
+    # this could be an old symlink that shouldn't be there
+    rmtree("$glob_mysql_test_dir/var");
+
+    # Remove the "var" dir
+    rmtree("$opt_vardir/");
+  }
 
   mkpath("$opt_vardir/log");
   mkpath("$opt_vardir/run");
@@ -1236,7 +1264,7 @@
     $slave->[0]->{'path_myddir'},
     $slave->[1]->{'path_myddir'},
     $slave->[2]->{'path_myddir'});
-  
+
   foreach my $instance (@{$instance_manager->{'instances'}})
   {
     push(@data_dir_lst, $instance->{'path_datadir'});
@@ -1249,18 +1277,27 @@
     mkpath("$data_dir/test");
   }
 
-  # To make some old test cases work, we create a soft
-  # link from the old "var" location to the new one
-
-  if ( ! $glob_win32 and $opt_vardir ne "$glob_mysql_test_dir/var" )
+  # Make a link std_data_ln in var/ that points to std_data
+  if ( ! $glob_win32 )
+  {
+    symlink("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
+  }
+  else
   {
-    # FIXME why bother with the above, why not always remove all of var?!
-    rmtree("$glob_mysql_test_dir/var"); # Clean old var, FIXME or rename it?!
-    symlink($opt_vardir, "$glob_mysql_test_dir/var");
+    # on windows, copy all files from std_data into var/std_data_ln
+    mkpath("$opt_vardir/std_data_ln");
+    opendir(DIR, "$glob_mysql_test_dir/std_data")
+      or mtr_error("Can't find the std_data directory: $!");
+    for(readdir(DIR)) {
+      next if -d "$glob_mysql_test_dir/std_data/$_";
+      copy("$glob_mysql_test_dir/std_data/$_", "$opt_vardir/std_data_ln/$_");
+    }
+    closedir(DIR);
   }
 }
 
 
+
 sub check_ssl_support () {
 
   if ($opt_skip_ssl)
@@ -2345,8 +2382,12 @@
     mtr_add_arg($args, "%s--skip-innodb", $prefix);
     mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
     mtr_add_arg($args, "%s--skip-slave-start", $prefix);
+
+    # Directory where slaves find the dumps generated by "load data"
+    # on the server. The path need to have constant length otherwise
+    # test results will vary, thus a relative path is used.
     mtr_add_arg($args, "%s--slave-load-tmpdir=%s", $prefix,
-                $path_slave_load_tmpdir);
+                "../tmp");
     mtr_add_arg($args, "%s--socket=%s", $prefix,
                 $slave->[$idx]->{'path_mysock'});
     mtr_add_arg($args, "%s--set-variable=slave_net_timeout=10", $prefix);
@@ -3025,7 +3066,7 @@
   sp-protocol           Create a stored procedure to execute all queries
   compress              Use the compressed protocol between client and server
   ssl                   Use ssl protocol between client and server
-  skip-ssl              Dont start sterver with support for ssl connections
+  skip-ssl              Dont start server with support for ssl connections
   bench                 Run the benchmark suite FIXME
   small-bench           FIXME
 

--- 1.26/mysql-test/r/mysqltest.result	2006-01-23 08:58:08 +01:00
+++ 1.27/mysql-test/r/mysqltest.result	2006-01-24 14:10:44 +01:00
@@ -223,8 +223,8 @@
 mysqltest: At line 1: Missing assignment operator in let
 mysqltest: At line 1: Missing file name in source
 mysqltest: At line 1: Could not open file ./non_existingFile
-mysqltest: In included file "./var/tmp/recursive.sql": At line 1: Source directives are nesting too deep
-mysqltest: In included file "./var/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1
 
 2 = outer loop variable after while
 here is the sourced script
@@ -358,9 +358,9 @@
 mysqltest: At line 1: Illegal argument for port: 'illegal_port'
 mysqltest: At line 1: Illegal option to connect: SMTP
 OK
-mysqltest: In included file "./var/tmp/con.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c
-mysqltest: In included file "./var/tmp/con.sql": At line 3: connection 'test_con1' not found in connection pool
-mysqltest: In included file "./var/tmp/con.sql": At line 2: Connection test_con1 already exists
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 3: connection 'test_con1' not found in connection pool
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 2: Connection test_con1 already exists
 Output from mysqltest-x.inc
 Output from mysqltest-x.inc
 Output from mysqltest-x.inc

--- 1.31/mysql-test/t/mysqltest.test	2006-01-19 10:28:59 +01:00
+++ 1.32/mysql-test/t/mysqltest.test	2006-01-24 14:10:44 +01:00
@@ -360,11 +360,11 @@
 # Missing delimiter
 # The comment will be "sucked into" the sleep command since
 # delimiter is missing until after "show status"
---system echo "sleep 4" > var/tmp/mysqltest.sql
---system echo "# A comment" >> var/tmp/mysqltest.sql
---system echo "show status;" >> var/tmp/mysqltest.sql
+--system echo "sleep 4" > $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+--system echo "# A comment" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+--system echo "show status;" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql
 --error 1
---exec $MYSQL_TEST < var/tmp/mysqltest.sql 2>&1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
 
 #
 # Missing delimiter until eof
@@ -587,25 +587,26 @@
 --exec echo "source non_existingFile;" | $MYSQL_TEST 2>&1
 
 # Too many source
---exec echo "source var/tmp/recursive.sql;" > var/tmp/recursive.sql
+--exec echo "source $MYSQLTEST_VARDIR/tmp/recursive.sql;" > $MYSQLTEST_VARDIR/tmp/recursive.sql
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error 1
---exec echo "source var/tmp/recursive.sql;" | $MYSQL_TEST 2>&1
+--exec echo "source $MYSQLTEST_VARDIR/tmp/recursive.sql;" | $MYSQL_TEST 2>&1
 
 # Source a file with error
---exec echo "garbage ;" > var/tmp/error.sql
+--exec echo "garbage ;" > $MYSQLTEST_VARDIR/tmp/error.sql
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error 1
---exec echo "source var/tmp/error.sql;" | $MYSQL_TEST 2>&1
+--exec echo "source $MYSQLTEST_VARDIR/tmp/error.sql;" | $MYSQL_TEST 2>&1
 
 
 # Test execution of source in a while loop
---exec echo "echo here is the sourced script;" > var/tmp/sourced.sql
 --disable_query_log
 let $outer= 2; # Number of outer loops
 while ($outer)
 {
   eval SELECT '$outer = outer loop variable after while' AS "";
 
-  --source var/tmp/sourced.sql
+  --source include/sourced.inc
 
   eval SELECT '$outer = outer loop variable before dec' AS "";
   dec $outer;
@@ -626,7 +627,6 @@
 
 
 # Test execution of source in a while loop
---exec echo "--source var/tmp/sourced.sql" > var/tmp/sourced1.sql
 --disable_abort_on_error
 # Sourcing of a file within while loop, sourced file will
 # source other file
@@ -634,7 +634,7 @@
 while ($num)
 {
    SELECT 'In loop' AS "";
-   --source var/tmp/sourced1.sql
+   --source include/sourced1.inc
    dec $num;
 }
 --enable_abort_on_error
@@ -772,20 +772,20 @@
 --error 1
 --exec echo "{;" | $MYSQL_TEST 2>&1
 
---system echo "while (0)" > var/tmp/mysqltest.sql
---system echo "echo hej;" >> var/tmp/mysqltest.sql
+--system echo "while (0)" > $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+--system echo "echo hej;" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql
 --error 1
---exec $MYSQL_TEST < var/tmp/mysqltest.sql 2>&1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
 
---system echo "while (0)" > var/tmp/mysqltest.sql
---system echo "{echo hej;" >> var/tmp/mysqltest.sql
+--system echo "while (0)" > $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+--system echo "{echo hej;" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql
 --error 1
---exec $MYSQL_TEST < var/tmp/mysqltest.sql 2>&1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
 
---system echo "while (0){" > var/tmp/mysqltest.sql
---system echo "echo hej;" >> var/tmp/mysqltest.sql
+--system echo "while (0){" > $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+--system echo "echo hej;" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql
 --error 1
---exec $MYSQL_TEST < var/tmp/mysqltest.sql 2>&1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
 
 # ----------------------------------------------------------------------------
 # Test error messages returned from comments starting with a command
@@ -876,38 +876,41 @@
 --exec echo "connect (con1,localhost,root,,,,,SMTP POP);" | $MYSQL_TEST 2>&1
 
 # Repeat connect/disconnect
---exec echo "let \$i=100;"                              > var/tmp/con.sql
---exec echo "while (\$i)"                              >> var/tmp/con.sql
---exec echo "{"                                        >> var/tmp/con.sql
---exec echo " connect (test_con1,localhost,root,,); "  >> var/tmp/con.sql
---exec echo " disconnect test_con1; "                  >> var/tmp/con.sql
---exec echo " dec \$i;                               " >> var/tmp/con.sql
---exec echo "}"                                        >> var/tmp/con.sql
---exec echo "source var/tmp/con.sql; echo OK;" | $MYSQL_TEST 2>&1
+--exec echo "let \$i=100;"                              > $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "while (\$i)"                              >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "{"                                        >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo " connect (test_con1,localhost,root,,); "  >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo " disconnect test_con1; "                  >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo " dec \$i;                               " >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "}"                                        >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "source $MYSQLTEST_VARDIR/tmp/con.sql; echo OK;" | $MYSQL_TEST 2>&1
 
 # Repeat connect/disconnect, exceed max number of connections
---exec echo "let \$i=200;"                              > var/tmp/con.sql
---exec echo "while (\$i)"                              >> var/tmp/con.sql
---exec echo "{"                                        >> var/tmp/con.sql
---exec echo " connect (test_con1,localhost,root,,); "  >> var/tmp/con.sql
---exec echo " disconnect test_con1; "                  >> var/tmp/con.sql
---exec echo " dec \$i;                               " >> var/tmp/con.sql
---exec echo "}"                                        >> var/tmp/con.sql
+--exec echo "let \$i=200;"                              > $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "while (\$i)"                              >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "{"                                        >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo " connect (test_con1,localhost,root,,); "  >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo " disconnect test_con1; "                  >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo " dec \$i;                               " >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "}"                                        >> $MYSQLTEST_VARDIR/tmp/con.sql
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error 1
---exec echo "source var/tmp/con.sql;" | $MYSQL_TEST 2>&1
+--exec echo "source $MYSQLTEST_VARDIR/tmp/con.sql;" | $MYSQL_TEST 2>&1
 
 # Select disconnected connection
---exec echo "connect (test_con1,localhost,root,,);"    > var/tmp/con.sql
---exec echo "disconnect test_con1; "                  >> var/tmp/con.sql
---exec echo "connection test_con1;"                   >> var/tmp/con.sql
+--exec echo "connect (test_con1,localhost,root,,);"    > $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "disconnect test_con1; "                  >> $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "connection test_con1;"                   >> $MYSQLTEST_VARDIR/tmp/con.sql
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error 1
---exec echo "source var/tmp/con.sql;" | $MYSQL_TEST 2>&1
+--exec echo "source $MYSQLTEST_VARDIR/tmp/con.sql;" | $MYSQL_TEST 2>&1
 
 # Connection name already used
---exec echo "connect (test_con1,localhost,root,,);"    > var/tmp/con.sql
---exec echo "connect (test_con1,localhost,root,,);"   >> var/tmp/con.sql
+--exec echo "connect (test_con1,localhost,root,,);"    > $MYSQLTEST_VARDIR/tmp/con.sql
+--exec echo "connect (test_con1,localhost,root,,);"   >> $MYSQLTEST_VARDIR/tmp/con.sql
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error 1
---exec echo "source var/tmp/con.sql;" | $MYSQL_TEST 2>&1
+--exec echo "source $MYSQLTEST_VARDIR/tmp/con.sql;" | $MYSQL_TEST 2>&1
 
 
 
@@ -1021,43 +1024,43 @@
 
 echo Failing multi statement query;
 # PS does not support multi statement
---exec echo "--disable_ps_protocol"                    > var/tmp/bug11731.sql
---exec echo "delimiter ||||;"                         >> var/tmp/bug11731.sql
---exec echo "create table t1 (a int primary key);"    >> var/tmp/bug11731.sql
---exec echo "insert into t1 values (1);"              >> var/tmp/bug11731.sql
---exec echo "select 'select-me';"                     >> var/tmp/bug11731.sql
---exec echo "insertz 'error query'||||"               >> var/tmp/bug11731.sql
---exec echo "delimiter ;||||"                         >> var/tmp/bug11731.sql
+--exec echo "--disable_ps_protocol"                    > $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "delimiter ||||;"                         >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "create table t1 (a int primary key);"    >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "insert into t1 values (1);"              >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "select 'select-me';"                     >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "insertz 'error query'||||"               >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "delimiter ;||||"                         >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
 
 --error 1
---exec $MYSQL_TEST -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql 2>&1
+--exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/bug11731.sql 2>&1
 drop table t1;
 
 --error 1
---exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1
+--exec $MYSQL_TEST --record -x $MYSQLTEST_VARDIR/tmp/bug11731.sql -R $MYSQLTEST_VARDIR/tmp/bug11731.out 2>&1
 # The .out file should be non existent
---exec test ! -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
+--exec test ! -s $MYSQLTEST_VARDIR/tmp/bug11731.out
 drop table t1;
 
 
 echo Multi statement using expected error;
 # PS does not support multi statement
---exec echo "--disable_ps_protocol"                    > var/tmp/bug11731.sql
---exec echo "delimiter ||||;"                         >> var/tmp/bug11731.sql
---exec echo "--error 1064"                            >> var/tmp/bug11731.sql
---exec echo "create table t1 (a int primary key);"    >> var/tmp/bug11731.sql
---exec echo "insert into t1 values (1);"              >> var/tmp/bug11731.sql
---exec echo "select 'select-me';"                     >> var/tmp/bug11731.sql
---exec echo "insertz "error query"||||"               >> var/tmp/bug11731.sql
---exec echo "delimiter ;||||"                         >> var/tmp/bug11731.sql
+--exec echo "--disable_ps_protocol"                    > $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "delimiter ||||;"                         >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "--error 1064"                            >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "create table t1 (a int primary key);"    >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "insert into t1 values (1);"              >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "select 'select-me';"                     >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "insertz "error query"||||"               >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
+--exec echo "delimiter ;||||"                         >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
 
 # These two should work since the error is expected
---exec $MYSQL_TEST -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql 2>&1
+--exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/bug11731.sql  2>&1
 drop table t1;
 
---exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1
+--exec $MYSQL_TEST --record -x $MYSQLTEST_VARDIR/tmp/bug11731.sql -R $MYSQLTEST_VARDIR/tmp/bug11731.out 2>&1
 # The .out file should exist
---exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
+--exec test -s $MYSQLTEST_VARDIR/tmp/bug11731.out
 drop table t1;
 
 

--- 1.23/mysql-test/t/ndb_autodiscover.test	2005-11-07 12:19:04 +01:00
+++ 1.24/mysql-test/t/ndb_autodiscover.test	2006-01-24 13:56:45 +01:00
@@ -24,7 +24,7 @@
 
 insert into t1 values(1, "Autodiscover");
 flush tables;
-system rm var/master-data/test/t1.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
 select * from t1;
 show status like 'handler_discover%';
 
@@ -33,13 +33,13 @@
 #
 
 flush tables;
-system rm var/master-data/test/t1.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
 insert into t1 values (2, "Auto 2");
 show status like 'handler_discover%';
 insert into t1 values (3, "Discover 3");
 show status like 'handler_discover%';
 flush tables;
-system rm var/master-data/test/t1.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
 select * from t1 order by id;
 show status like 'handler_discover%';
 
@@ -48,7 +48,7 @@
 #
 
 flush tables;
-system rm var/master-data/test/t1.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
 update t1 set name="Autodiscover" where id = 2;
 show status like 'handler_discover%';
 select * from t1 order by id;
@@ -59,7 +59,7 @@
 #
 
 flush tables;
-system rm var/master-data/test/t1.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
 delete from  t1 where id = 3;
 select * from t1 order by id;
 show status like 'handler_discover%';
@@ -85,7 +85,7 @@
 flush tables;
 
 # Modify the frm file on disk
-system echo "blaj" >> var/master-data/test/t2.frm ;
+system echo "blaj" >> $MYSQLTEST_VARDIR/master-data/test/t2.frm ;
 select * from t2;
 
 show status like 'handler_discover%';
@@ -111,7 +111,7 @@
 flush tables;
 
 # Remove the frm file from disk
-system rm var/master-data/test/t3.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t3.frm ;
 
 --error 1050
 create table t3(
@@ -168,14 +168,14 @@
 
 # Remove the frm file from disk
 flush tables;
-system rm var/master-data/test/t7.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm ;
 
 show tables from test;
 show status like 'handler_discover%';
 
 # Remove the frm file from disk again
 flush tables;
-system rm var/master-data/test/t7.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm ;
 
 --replace_column 6 # 7 # 8 # 9 # 12 # 13 # 15 # 18 #
 show table status;
@@ -290,8 +290,8 @@
 system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 >> $NDB_TOOLS_OUTPUT ;
 system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 >> $NDB_TOOLS_OUTPUT ;
 # Remove t6, t7 from disk
-system rm var/master-data/test/t6.frm > /dev/null ; 
-system rm var/master-data/test/t7.frm > /dev/null ; 
+system rm $MYSQLTEST_VARDIR/master-data/test/t6.frm > /dev/null ; 
+system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm > /dev/null ; 
 
 SHOW TABLES;
 
@@ -332,8 +332,8 @@
 system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null  ;
 system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null  ;
 # Remove t6, t7 from disk
-system rm var/master-data/test/t6.frm > /dev/null ; 
-system rm var/master-data/test/t7.frm > /dev/null ; 
+system rm $MYSQLTEST_VARDIR/master-data/test/t6.frm > /dev/null ; 
+system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm > /dev/null ; 
 
 
 SHOW TABLES LIKE 't6';
@@ -375,9 +375,9 @@
 insert into t4 values (4);
 
 # Remove t1, t2, t3 from disk
-system rm var/master-data/test/t1.frm > /dev/null ; 
-system rm var/master-data/test/t2.frm > /dev/null ; 
-system rm var/master-data/test/t3.frm > /dev/null ; 
+system rm $MYSQLTEST_VARDIR/master-data/test/t1.frm > /dev/null ; 
+system rm $MYSQLTEST_VARDIR/master-data/test/t2.frm > /dev/null ; 
+system rm $MYSQLTEST_VARDIR/master-data/test/t3.frm > /dev/null ; 
 flush tables;
 
 # Select from the table which only exists in NDB.
@@ -530,7 +530,7 @@
 insert t9 values(1, 2), (2,3), (3, 4), (4, 5);
 
 #Don't drop the table, instead remove the frm file
-system rm var/master-data/test/t9.frm ;
+system rm $MYSQLTEST_VARDIR/master-data/test/t9.frm ;
 
 # Now leave test case, when ndb_autodiscover2 will  run, this 
 # MySQL Server will have been restarted because it has a 

--- 1.61/mysql-test/t/show_check.test	2006-01-19 03:56:00 +01:00
+++ 1.62/mysql-test/t/show_check.test	2006-01-24 13:56:46 +01:00
@@ -387,7 +387,7 @@
 flush tables;
 
 # Create a junk frm file on disk
-system echo "this is a junk file for test" >> var/master-data/test/t1.frm ;
+system echo "this is a junk file for test" >> $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
 --replace_column 6 # 7 # 8 # 9 #
 SHOW TABLE STATUS like 't1';
 --error 1033

--- 1.23/mysql-test/t/warnings.test	2005-11-07 16:24:35 +01:00
+++ 1.24/mysql-test/t/warnings.test	2006-01-24 13:56:47 +01:00
@@ -50,7 +50,7 @@
 #
 
 create table t1(a tinyint, b int not null, c date, d char(5));
-load data infile '../../std_data/warnings_loaddata.dat' into table t1 fields terminated by ',';
+load data infile '../std_data_ln/warnings_loaddata.dat' into table t1 fields terminated by ',';
 # PS doesn't work good with @@warning_count
 --disable_ps_protocol
 select @@warning_count;

--- 1.69/mysql-test/r/query_cache.result	2006-01-19 10:25:04 +01:00
+++ 1.70/mysql-test/r/query_cache.result	2006-01-24 13:56:44 +01:00
@@ -1076,6 +1076,7 @@
 1	2
 2	2
 drop procedure p1//
+drop function f1//
 drop table t1//
 flush query cache;
 reset query cache;

--- 1.54/mysql-test/t/query_cache.test	2006-01-04 11:18:53 +01:00
+++ 1.55/mysql-test/t/query_cache.test	2006-01-24 13:56:45 +01:00
@@ -787,6 +787,7 @@
 end//
 call p1()//
 drop procedure p1//
+drop function f1//
 
 drop table t1//
 delimiter ;//

--- 1.18/mysql-test/t/symlink.test	2005-12-14 21:39:15 +01:00
+++ 1.19/mysql-test/t/symlink.test	2006-01-24 13:56:47 +01:00
@@ -43,7 +43,7 @@
 # 
 
 disable_query_log;
-eval create table t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="$MYSQL_TEST_DIR/var/tmp" index directory="$MYSQL_TEST_DIR/var/run";
+eval create table t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp" index directory="$MYSQLTEST_VARDIR/run";
 enable_query_log;
 
 insert into t9 select * from t1;
@@ -52,7 +52,7 @@
 repair table t9;
 alter table t9 add column c int not null;
 
---replace_result $MYSQL_TEST_DIR TEST_DIR
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 show create table t9;
 
 # Test renames
@@ -67,7 +67,7 @@
 # Note that we are using the above table t9 here!
 #
 
---replace_result $MYSQL_TEST_DIR TEST_DIR
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 SHOW CREATE TABLE t9;
 
 disable_query_log;
@@ -86,11 +86,11 @@
 
 # Should fail becasue the file t9.MYI already exist in 'run'
 --error 1,1,1105
-eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="$MYSQL_TEST_DIR/var/run";
+eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="$MYSQLTEST_VARDIR/run";
 
 # Should fail becasue the file t9.MYD already exist in 'tmp'
 --error 1,1
-eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="$MYSQL_TEST_DIR/var/tmp";
+eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp";
 enable_query_log;
 
 # Check moving table t9 from default database to mysqltest;
@@ -98,7 +98,7 @@
 
 alter table t9 rename mysqltest.t9;
 select count(*) from mysqltest.t9;
---replace_result $MYSQL_TEST_DIR TEST_DIR
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 show create table mysqltest.t9;
 drop database mysqltest;
 
@@ -108,18 +108,18 @@
 
 create table t1 (a int not null) engine=myisam;
 disable_query_log;
-eval alter table t1 data directory="$MYSQL_TEST_DIR/var/tmp";
+eval alter table t1 data directory="$MYSQLTEST_VARDIR/tmp";
 enable_query_log;
---replace_result $MYSQL_TEST_DIR TEST_DIR
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 show create table t1;
 alter table t1 add b int;
 disable_query_log;
-eval alter table t1 data directory="$MYSQL_TEST_DIR/var/log";
+eval alter table t1 data directory="$MYSQLTEST_VARDIR/log";
 enable_query_log;
---replace_result $MYSQL_TEST_DIR TEST_DIR
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 show create table t1;
 disable_query_log;
-eval alter table t1 index directory="$MYSQL_TEST_DIR/var/log";
+eval alter table t1 index directory="$MYSQLTEST_VARDIR/log";
 enable_query_log;
 show create table t1;
 drop table t1;
@@ -129,12 +129,12 @@
 # have been chosen. (Bug #8707)
 #
 disable_query_log;
-eval create table t1 (i int) data directory = "$MYSQL_TEST_DIR/var/master-data/test/";
+eval create table t1 (i int) data directory = "$MYSQLTEST_VARDIR/master-data/test/";
 enable_query_log;
 show create table t1;
 drop table t1;
 disable_query_log;
-eval create table t1 (i int) index directory = "$MYSQL_TEST_DIR/var/master-data/test/";
+eval create table t1 (i int) index directory = "$MYSQLTEST_VARDIR/master-data/test/";
 enable_query_log;
 show create table t1;
 drop table t1;

--- 1.29/mysql-test/r/rpl_loaddata.result	2005-12-22 05:10:52 +01:00
+++ 1.30/mysql-test/r/rpl_loaddata.result	2006-01-24 14:10:44 +01:00
@@ -6,9 +6,9 @@
 start slave;
 reset master;
 create table t1(a int not null auto_increment, b int, primary key(a) );
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
 create temporary table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60));
-load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines;
+load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines;
 create table t3 (day date,id int(9),category enum('a','b','c'),name varchar(60));
 insert into t3 select * from t2;
 select * from t1;
@@ -28,7 +28,7 @@
 drop table t3;
 create table t1(a int, b int, unique(b));
 insert into t1 values(1,10);
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
 set global sql_slave_skip_counter=1;
 start slave;
 show slave status;
@@ -37,7 +37,7 @@
 set sql_log_bin=0;
 delete from t1;
 set sql_log_bin=1;
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
 stop slave;
 change master to master_user='test';
 change master to master_user='root';
@@ -49,7 +49,7 @@
 set sql_log_bin=0;
 delete from t1;
 set sql_log_bin=1;
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
 stop slave;
 reset slave;
 show slave status;
@@ -58,7 +58,7 @@
 reset master;
 create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
 unique(day)) engine=MyISAM;
-load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields
+load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields
 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;
 ERROR 23000: Duplicate entry '2003-03-22' for key 1
@@ -73,7 +73,7 @@
 2003-03-22	2161	c	asdf
 alter table t2 drop key day;
 delete from t2;
-load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields
+load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields
 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;
 ERROR 23000: Duplicate entry '2003-03-22' for key 1

--- 1.22/mysql-test/r/loaddata.result	2006-01-18 09:50:10 +01:00
+++ 1.23/mysql-test/r/loaddata.result	2006-01-24 13:56:43 +01:00
@@ -1,6 +1,6 @@
 drop table if exists t1, t2;
 create table t1 (a date, b date, c date not null, d date);
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',';
+load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',';
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1265	Data truncated for column 'c' at row 1
@@ -8,7 +8,7 @@
 Warning	1265	Data truncated for column 'a' at row 2
 Warning	1265	Data truncated for column 'b' at row 2
 Warning	1265	Data truncated for column 'd' at row 2
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES;
+load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES;
 SELECT * from t1;
 a	b	c	d
 0000-00-00	NULL	0000-00-00	0000-00-00
@@ -16,7 +16,7 @@
 2003-03-03	2003-03-03	2003-03-03	NULL
 2003-03-03	2003-03-03	2003-03-03	NULL
 truncate table t1;
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
+load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
 Warning	1265	Data truncated for column 'd' at row 1
@@ -29,7 +29,7 @@
 NULL	2003-03-03	2003-03-03	NULL
 drop table t1;
 create table t1 (a text, b text);
-load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
 Warnings:
 Warning	1261	Row 3 doesn't contain data for all columns
 select concat('|',a,'|'), concat('|',b,'|') from t1;
@@ -41,7 +41,7 @@
 |Field 6|	| 'Field 7'|
 drop table t1;
 create table t1 (a int, b char(10));
-load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
+load data infile '../std_data_ln/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 3
 Warning	1262	Row 3 was truncated; it contained more data than there were input columns
@@ -55,7 +55,7 @@
 3	row 3
 0	1234567890
 truncate table t1;
-load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
+load data infile '../std_data_ln/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 4
 Warning	1261	Row 4 doesn't contain data for all columns
@@ -78,7 +78,7 @@
 SET @@SQL_MODE=@OLD_SQL_MODE;
 drop table t1;
 create table t1 (a varchar(20), b varchar(20));
-load data infile '../../std_data/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b);
+load data infile '../std_data_ln/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b);
 select * from t1;
 a	b
 field1	field2
@@ -86,25 +86,25 @@
 a"b	c"d"e
 drop table t1;
 create table t1 (a int default 100, b int, c varchar(60));
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);
 select * from t1;
 a	b	c
 NULL	20	b=10
 NULL	25	b=15
 truncate table t1;
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set c= if(a is null,"oops",a);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set c= if(a is null,"oops",a);
 select * from t1;
 a	b	c
 NULL	NULL	oops
 NULL	NULL	oops
 truncate table t1;
 set @c:=123;
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, b) set c= if(@a is null,@c,b);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, b) set c= if(@a is null,@c,b);
 select * from t1;
 a	b	c
 100	10	123
 100	15	123
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, @b);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, @b);
 select * from t1;
 a	b	c
 100	10	123
@@ -115,25 +115,25 @@
 @a	@b
 NULL	15
 truncate table t1;
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c="Wow";
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c="Wow";
 select * from t1;
 a	b	c
 1	2	Wow
 3	4	Wow
 5	6	Wow
 truncate table t1;
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c));
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c));
 select * from t1;
 a	b	c
 1	2	1+2+123+2+NIL
 3	4	3+4+123+4+NIL
 5	6	5+6+123+6+NIL
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b);
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b);
 ERROR HY000: Can't load value from file with fixed size rows to variable
 create table t2 (num int primary key, str varchar(10));
 insert into t2 values (10,'Ten'), (15,'Fifteen');
 truncate table t1;
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n);
 select * from t1;
 a	b	c
 10	NULL	Ten

--- 1.16/mysql-test/t/loaddata.test	2006-01-18 09:49:58 +01:00
+++ 1.17/mysql-test/t/loaddata.test	2006-01-24 13:56:45 +01:00
@@ -7,25 +7,25 @@
 --enable_warnings
 
 create table t1 (a date, b date, c date not null, d date);
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',';
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES;
+load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',';
+load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES;
 SELECT * from t1;
 truncate table t1;
 
-load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
+load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
 SELECT * from t1;
 drop table t1;
 
 create table t1 (a text, b text);
-load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
 select concat('|',a,'|'), concat('|',b,'|') from t1;
 drop table t1;
 
 create table t1 (a int, b char(10));
-load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
+load data infile '../std_data_ln/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 select * from t1;
 truncate table t1;
-load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
+load data infile '../std_data_ln/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
 
 # The empty line last comes from the end line field in the file
 select * from t1;
@@ -38,23 +38,23 @@
 create table t1(id integer not null auto_increment primary key);
 insert into t1 values(0);
 disable_query_log;
-eval SELECT * INTO OUTFILE '$MYSQL_TEST_DIR/var/tmp/t1' from t1;
+eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1' from t1;
 delete from t1;
-eval load data infile '$MYSQL_TEST_DIR/var/tmp/t1' into table t1;
+eval load data infile '$MYSQLTEST_VARDIR/tmp/t1' into table t1;
 enable_query_log;
 select * from t1;
---exec rm $MYSQL_TEST_DIR/var/tmp/t1
+--exec rm $MYSQLTEST_VARDIR/tmp/t1
 
 disable_query_log;
-eval SELECT * INTO OUTFILE '$MYSQL_TEST_DIR/var/tmp/t1'
+eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1'
 FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n'
 FROM t1;
 delete from t1;
-eval load data infile '$MYSQL_TEST_DIR/var/tmp/t1' into table t1
+eval load data infile '$MYSQLTEST_VARDIR/tmp/t1' into table t1
 FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n';
 enable_query_log;
 select * from t1;
---exec rm $MYSQL_TEST_DIR/var/tmp/t1
+--exec rm $MYSQLTEST_VARDIR/tmp/t1
 SET @@SQL_MODE=@OLD_SQL_MODE;
 drop table t1;
 
@@ -63,7 +63,7 @@
 # ENCLOSED
 #
 create table t1 (a varchar(20), b varchar(20));
-load data infile '../../std_data/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b);
+load data infile '../std_data_ln/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b);
 select * from t1;
 drop table t1;
 
@@ -74,40 +74,40 @@
 #
 create table t1 (a int default 100, b int, c varchar(60));
 # we can do something like this
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);
 select * from t1;
 truncate table t1;
 # we can use filled fields in expressions 
 # we also assigning NULL value to field with non-NULL default here
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set c= if(a is null,"oops",a);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set c= if(a is null,"oops",a);
 select * from t1;
 truncate table t1;
 # we even can use variables in set clause, and missed columns will be set
 # with default values
 set @c:=123;
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, b) set c= if(@a is null,@c,b);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, b) set c= if(@a is null,@c,b);
 select * from t1;
 # let us test side-effect of such load
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, @b);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, @b);
 select * from t1;
 select @a, @b;
 truncate table t1;
 # now going to test fixed field-row file format
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c="Wow";
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c="Wow";
 select * from t1;
 truncate table t1;
 # this also should work
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c));
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c));
 select * from t1;
 # and this should bark
 --error 1409 
-load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b);
+load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b);
 
 # Now let us test LOAD DATA with subselect
 create table t2 (num int primary key, str varchar(10));
 insert into t2 values (10,'Ten'), (15,'Fifteen');
 truncate table t1;
-load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n);
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n);
 select * from t1;
 
 # cleanup

--- 1.5/mysql-test/t/sp-destruct.test	2006-01-19 10:25:04 +01:00
+++ 1.6/mysql-test/t/sp-destruct.test	2006-01-24 13:56:46 +01:00
@@ -16,9 +16,9 @@
 --source include/not_windows.inc
 
 # Backup proc table
---system rm -rf var/master-data/mysql/backup
---system mkdir var/master-data/mysql/backup
---system cp var/master-data/mysql/proc.* var/master-data/mysql/backup/
+--system rm -rf $MYSQLTEST_VARDIR/master-data/mysql/backup
+--system mkdir $MYSQLTEST_VARDIR/master-data/mysql/backup
+--system cp $MYSQLTEST_VARDIR/master-data/mysql/proc.* $MYSQLTEST_VARDIR/master-data/mysql/backup/
 
 use test;
 
@@ -53,7 +53,7 @@
 flush table mysql.proc;
 
 # Thrashing the .frm file
---system echo 'saljdlfa' > var/master-data/mysql/proc.frm
+--system echo 'saljdlfa' > $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
 --error ER_NOT_FORM_FILE
 call bug14233();
 --error ER_NOT_FORM_FILE
@@ -65,7 +65,7 @@
 flush table mysql.proc;
 
 # Drop the mysql.proc table
---system rm var/master-data/mysql/proc.*
+--system rm $MYSQLTEST_VARDIR/master-data/mysql/proc.*
 --error ER_NO_SUCH_TABLE
 call bug14233();
 --error ER_NO_SUCH_TABLE
@@ -74,8 +74,8 @@
 insert into t1 values (0);
 
 # Restore mysql.proc
---system mv var/master-data/mysql/backup/* var/master-data/mysql/
---system rmdir var/master-data/mysql/backup
+--system mv $MYSQLTEST_VARDIR/master-data/mysql/backup/* $MYSQLTEST_VARDIR/master-data/mysql/
+--system rmdir $MYSQLTEST_VARDIR/master-data/mysql/backup
 
 flush table mysql.proc;
 flush privileges;

--- 1.78/mysql-test/t/mysqldump.test	2005-12-02 00:14:47 +01:00
+++ 1.79/mysql-test/t/mysqldump.test	2006-01-24 13:56:45 +01:00
@@ -125,14 +125,14 @@
 
 create table t1(a int);
 insert into t1 values (1),(2),(3);
---exec $MYSQL_DUMP --skip-comments --tab=$MYSQL_TEST_DIR/var/tmp/ test
---exec cat $MYSQL_TEST_DIR/var/tmp/t1.sql
---exec cat $MYSQL_TEST_DIR/var/tmp/t1.txt
---exec rm $MYSQL_TEST_DIR/var/tmp/t1.sql
---exec rm $MYSQL_TEST_DIR/var/tmp/t1.txt
---exec $MYSQL_DUMP --tab=$MYSQL_TEST_DIR/var/tmp/ test
---exec rm $MYSQL_TEST_DIR/var/tmp/t1.sql
---exec rm $MYSQL_TEST_DIR/var/tmp/t1.txt
+--exec $MYSQL_DUMP --skip-comments --tab=$MYSQLTEST_VARDIR/tmp/ test
+--exec cat $MYSQLTEST_VARDIR/tmp/t1.sql
+--exec cat $MYSQLTEST_VARDIR/tmp/t1.txt
+--exec rm $MYSQLTEST_VARDIR/tmp/t1.sql
+--exec rm $MYSQLTEST_VARDIR/tmp/t1.txt
+--exec $MYSQL_DUMP --tab=$MYSQLTEST_VARDIR/tmp/ test
+--exec rm $MYSQLTEST_VARDIR/tmp/t1.sql
+--exec rm $MYSQLTEST_VARDIR/tmp/t1.txt
 drop table t1;
 
 #
@@ -587,7 +587,7 @@
 create view v2 as select * from t1;
 
 # dump tables and view from db2
---exec $MYSQL_DUMP db2 > var/tmp/bug10713.sql
+--exec $MYSQL_DUMP db2 > $MYSQLTEST_VARDIR/tmp/bug10713.sql
 
 # drop the db, tables and views
 drop table t1, t2;
@@ -597,7 +597,7 @@
 # create db1 and reload dump
 create database db1;
 use db1;
---exec $MYSQL db1 < var/tmp/bug10713.sql
+--exec $MYSQL db1 < $MYSQLTEST_VARDIR/tmp/bug10713.sql
 
 # check that all tables and views could be created
 show tables;
@@ -705,9 +705,9 @@
 create table t1 (a text character set utf8, b text character set latin1);
 insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E);
 select * from t1;
---exec $MYSQL_DUMP --tab=$MYSQL_TEST_DIR/var/tmp/ test
---exec $MYSQL test < $MYSQL_TEST_DIR/var/tmp/t1.sql
---exec $MYSQL_IMPORT test $MYSQL_TEST_DIR/var/tmp/t1.txt
+--exec $MYSQL_DUMP --tab=$MYSQLTEST_VARDIR/tmp/ test
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/t1.sql
+--exec $MYSQL_IMPORT test $MYSQLTEST_VARDIR/tmp/t1.txt
 select * from t1;
 
 drop table t1;
@@ -827,9 +827,9 @@
 # Skip dumping triggers
 --exec $MYSQL_DUMP --skip-comments --databases --skip-triggers test
 # Dump and reload...
---exec $MYSQL_DUMP --skip-comments --databases test > var/tmp/mysqldump.sql
+--exec $MYSQL_DUMP --skip-comments --databases test > $MYSQLTEST_VARDIR/tmp/mysqldump.sql
 drop table t1;
---exec $MYSQL test < var/tmp/mysqldump.sql
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqldump.sql
 # Check that tables have been reloaded
 show tables;
 --replace_column 6 #
@@ -840,11 +840,11 @@
 # Bugs #9136, #12917: problems with --defaults-extra-file option
 #
 
---exec echo "[mysqltest1]" > $MYSQL_TEST_DIR/var/tmp/tmp.cnf
---exec echo "port=1234" >> $MYSQL_TEST_DIR/var/tmp/tmp.cnf
---exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQL_TEST_DIR/var/tmp/tmp.cnf mysqltest1
---exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQL_TEST_DIR/var/tmp/tmp.cnf mysqltest1 mysqltest1
---exec rm $MYSQL_TEST_DIR/var/tmp/tmp.cnf
+--exec echo "[mysqltest1]" > $MYSQLTEST_VARDIR/tmp/tmp.cnf
+--exec echo "port=1234" >> $MYSQLTEST_VARDIR/tmp/tmp.cnf
+--exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1
+--exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1 mysqltest1
+--exec rm $MYSQLTEST_VARDIR/tmp/tmp.cnf
 
 #
 # Test of fix to BUG 12597
@@ -869,13 +869,13 @@
 SELECT * FROM `test2`;
 
 # dump
---exec $MYSQL_DUMP --skip-comments --databases test > var/tmp/mysqldump.sql
+--exec $MYSQL_DUMP --skip-comments --databases test > $MYSQLTEST_VARDIR/tmp/mysqldump.sql
 
 #DROP TRIGGER testref;
 #DROP TABLE test1;
 #DROP TABLE test2;
 # restore
---exec $MYSQL test < var/tmp/mysqldump.sql
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqldump.sql
 SHOW TRIGGERS;
 SELECT * FROM `test1`;
 SELECT * FROM `test2`;

--- 1.7/mysql-test/t/rpl_drop_db.test	2006-01-06 01:07:25 +01:00
+++ 1.8/mysql-test/t/rpl_drop_db.test	2006-01-24 14:10:44 +01:00
@@ -54,5 +54,5 @@
 #cleanup
 connection slave;
 stop slave;
-#system rm -rf var/master-data/mysqltest1;
+#system rm -rf $MYSQLTEST_VARDIR/master-data/mysqltest1;
 

--- 1.31/mysql-test/r/rpl_replicate_do.result	2005-12-22 05:10:53 +01:00
+++ 1.32/mysql-test/r/rpl_replicate_do.result	2006-01-24 13:56:44 +01:00
@@ -9,7 +9,7 @@
 create table t2 (n int);
 insert into t2 values(4);
 create table t2 (s char(20));
-load data infile '../../std_data/words.dat' into table t2;
+load data infile '../std_data_ln/words.dat' into table t2;
 insert into t2 values('five');
 create table t1 (m int);
 insert into t1 values(15),(16),(17);

--- 1.12/mysql-test/r/backup.result	2005-12-30 11:53:49 +01:00
+++ 1.13/mysql-test/r/backup.result	2006-01-24 13:56:43 +01:00
@@ -6,7 +6,7 @@
 test.t4	backup	error	Failed copying .frm file (errno: X)
 test.t4	backup	status	Operation failed
 Warnings:
-Error	1	Can't create/write to file 'MYSQL_TEST_DIR/var/bogus/t4.frm' (Errcode: X)
+Error	1	Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)
 backup table t4 to '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t4	backup	status	OK
@@ -15,7 +15,7 @@
 test.t4	backup	error	Failed copying .frm file (errno: X)
 test.t4	backup	status	Operation failed
 Warnings:
-Error	1	Can't create/write to file 'MYSQL_TEST_DIR/var/tmp/t4.frm' (Errcode: X)
+Error	1	Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)
 drop table t4;
 restore table t4 from '../tmp';
 Table	Op	Msg_type	Msg_text
@@ -33,7 +33,7 @@
 Table	Op	Msg_type	Msg_text
 t1	restore	error	Failed copying .frm file
 Warnings:
-Error	29	File 'MYSQL_TEST_DIR/var/bogus/t1.frm' not found (Errcode: X)
+Error	29	File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X)
 restore table t1 from '../tmp';
 Table	Op	Msg_type	Msg_text
 test.t1	restore	status	OK

--- 1.29.1.1/mysql-test/r/rpl000001.result	2006-01-24 08:30:46 +01:00
+++ 1.32/mysql-test/r/rpl_stm_000001.result	2006-01-24 13:56:44 +01:00
@@ -50,7 +50,7 @@
 0
 kill @id;
 drop table t2;
-ERROR 08S01: Server shutdown in progress
+Got one of the listed errors
 set global sql_slave_skip_counter=1;
 start slave;
 select count(*) from t1;

--- 1.62.1.1/mysql-test/r/rpl_log.result	2006-01-24 08:30:46 +01:00
+++ 1.64/mysql-test/r/rpl_stm_log.result	2006-01-24 14:10:44 +01:00
@@ -19,25 +19,25 @@
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	98	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	219	Intvar	1	247	INSERT_ID=1
-master-bin.000001	247	Query	1	338	use `test`; insert into t1 values (NULL)
-master-bin.000001	338	Query	1	414	use `test`; drop table t1
-master-bin.000001	414	Query	1	517	use `test`; create table t1 (word char(20) not null)
-master-bin.000001	517	Begin_load_query	1	1121	;file_id=1;block_len=581
-master-bin.000001	1121	Execute_load_query	1	1269	use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001	1269	Query	1	1345	use `test`; drop table t1
-show binlog events from 98 limit 1;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
-show binlog events from 98 limit 2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	219	Intvar	1	247	INSERT_ID=1
-show binlog events from 98 limit 2,1;
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	#	Intvar	1	#	INSERT_ID=1
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL)
+master-bin.000001	#	Query	1	#	use `test`; drop table t1
+master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)
+master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
+master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001	#	Query	1	#	use `test`; drop table t1
+show binlog events from 102 limit 1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)
+show binlog events from 102 limit 2;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	#	Intvar	1	#	INSERT_ID=1
+show binlog events from 102 limit 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	247	Query	1	338	use `test`; insert into t1 values (NULL)
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL)
 flush logs;
 create table t5 (a int);
 drop table t5;
@@ -49,55 +49,55 @@
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	98	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	219	Intvar	1	247	INSERT_ID=1
-master-bin.000001	247	Query	1	338	use `test`; insert into t1 values (NULL)
-master-bin.000001	338	Query	1	414	use `test`; drop table t1
-master-bin.000001	414	Query	1	517	use `test`; create table t1 (word char(20) not null)
-master-bin.000001	517	Begin_load_query	1	1121	;file_id=1;block_len=581
-master-bin.000001	1121	Execute_load_query	1	1269	use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001	1269	Query	1	1345	use `test`; drop table t1
-master-bin.000001	1345	Rotate	1	1389	master-bin.000002;pos=4
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	#	Intvar	1	#	INSERT_ID=1
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL)
+master-bin.000001	#	Query	1	#	use `test`; drop table t1
+master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)
+master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
+master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001	#	Query	1	#	use `test`; drop table t1
+master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	4	Format_desc	1	98	Server ver: VERSION, Binlog ver: 4
-master-bin.000002	98	Query	1	184	use `test`; create table t5 (a int)
-master-bin.000002	184	Query	1	260	use `test`; drop table t5
-master-bin.000002	260	Query	1	346	use `test`; create table t1 (n int)
-master-bin.000002	346	Query	1	434	use `test`; insert into t1 values (1)
-master-bin.000002	434	Query	1	510	use `test`; drop table t1
+master-bin.000002	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000002	#	Query	1	#	use `test`; create table t5 (a int)
+master-bin.000002	#	Query	1	#	use `test`; drop table t5
+master-bin.000002	#	Query	1	#	use `test`; create table t1 (n int)
+master-bin.000002	#	Query	1	#	use `test`; insert into t1 values (1)
+master-bin.000002	#	Query	1	#	use `test`; drop table t1
 show binary logs;
 Log_name	File_size
-master-bin.000001	1389
-master-bin.000002	510
+master-bin.000001	1393
+master-bin.000002	514
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1552
-slave-bin.000002	348
+slave-bin.000001	1563
+slave-bin.000002	352
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	4	Format_desc	2	98	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
-slave-bin.000001	219	Intvar	1	247	INSERT_ID=1
-slave-bin.000001	247	Query	1	338	use `test`; insert into t1 values (NULL)
-slave-bin.000001	338	Query	1	414	use `test`; drop table t1
-slave-bin.000001	414	Query	1	517	use `test`; create table t1 (word char(20) not null)
-slave-bin.000001	517	Begin_load_query	1	1121	;file_id=1;block_len=581
-slave-bin.000001	1121	Execute_load_query	1	1271	use `test`; load data INFILE '../tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
-slave-bin.000001	1271	Query	1	1347	use `test`; drop table t1
-slave-bin.000001	1347	Query	1	1433	use `test`; create table t5 (a int)
-slave-bin.000001	1433	Query	1	1509	use `test`; drop table t5
-slave-bin.000001	1509	Rotate	2	1552	slave-bin.000002;pos=4
+slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
+slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)
+slave-bin.000001	#	Intvar	1	#	INSERT_ID=1
+slave-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL)
+slave-bin.000001	#	Query	1	#	use `test`; drop table t1
+slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)
+slave-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
+slave-bin.000001	#	Execute_load_query	1	#	use `test`; load data INFILE '../tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
+slave-bin.000001	#	Query	1	#	use `test`; drop table t1
+slave-bin.000001	#	Query	1	#	use `test`; create table t5 (a int)
+slave-bin.000001	#	Query	1	#	use `test`; drop table t5
+slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000002	4	Format_desc	2	98	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	98	Query	1	184	use `test`; create table t1 (n int)
-slave-bin.000002	184	Query	1	272	use `test`; insert into t1 values (1)
-slave-bin.000002	272	Query	1	348	use `test`; drop table t1
+slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
+slave-bin.000002	#	Query	1	#	use `test`; create table t1 (n int)
+slave-bin.000002	#	Query	1	#	use `test`; insert into t1 values (1)
+slave-bin.000002	#	Query	1	#	use `test`; drop table t1
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	510	#	#	master-bin.000002	Yes	Yes							0		0	510	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	514	#	#	master-bin.000002	Yes	Yes				#			0		0	514	#	None		0	No						#
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log

--- 1.37/mysql-test/r/warnings.result	2005-12-02 12:01:38 +01:00
+++ 1.38/mysql-test/r/warnings.result	2006-01-24 13:56:45 +01:00
@@ -70,7 +70,7 @@
 1
 drop table t1;
 create table t1(a tinyint, b int not null, c date, d char(5));
-load data infile '../../std_data/warnings_loaddata.dat' into table t1 fields terminated by ',';
+load data infile '../std_data_ln/warnings_loaddata.dat' into table t1 fields terminated by ',';
 Warnings:
 Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
 Warning	1265	Data truncated for column 'd' at row 3

--- 1.41.1.1/mysql-test/t/rpl000001.test	2006-01-24 08:30:48 +01:00
+++ 1.44/mysql-test/extra/rpl_tests/rpl_stm_000001.test	2006-01-24 13:56:43 +01:00
@@ -1,4 +1,5 @@
-source include/master-slave.inc;
+-- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
 
 create table t1 (word char(20) not null);
 load data infile '../std_data_ln/words.dat' into table t1;
@@ -44,7 +45,7 @@
 
 connection master;
 # we'll use table-level locking to delay slave SQL thread
-create table t1 (n int) engine=myisam;
+eval create table t1 (n int) engine=$engine_type;
 sync_slave_with_master;
 connection master;
 reset master;
@@ -92,7 +93,7 @@
 # We don't drop t3 as this is a temporary table
 drop table t2;
 connection master;
---error 1053
+--error 1053,2013
 reap;
 connection slave;
 # The SQL slave thread should now have stopped because the query was killed on

--- 1.23/mysql-test/t/rpl_replicate_do.test	2005-12-22 05:10:56 +01:00
+++ 1.24/mysql-test/t/rpl_replicate_do.test	2006-01-24 13:56:46 +01:00
@@ -11,7 +11,7 @@
 insert into t2 values(4);
 connection master;
 create table t2 (s char(20));
-load data infile '../../std_data/words.dat' into table t2;
+load data infile '../std_data_ln/words.dat' into table t2;
 insert into t2 values('five');
 create table t1 (m int);
 insert into t1 values(15),(16),(17);

--- 1.18/mysql-test/t/backup.test	2006-01-04 11:28:27 +01:00
+++ 1.19/mysql-test/t/backup.test	2006-01-24 13:56:45 +01:00
@@ -13,10 +13,10 @@
 drop table if exists t1, t2, t3, t4;
 --enable_warnings
 create table t4(n int);
---replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 backup table t4 to '../bogus';
 backup table t4 to '../tmp';
---replace_result ": 7" ": X" ": 17" ": X" $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result ": 7" ": X" ": 17" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 backup table t4 to '../tmp';
 drop table t4;
 restore table t4 from '../tmp';
@@ -26,7 +26,7 @@
 insert into t1 values (23),(45),(67);
 backup table t1 to '../tmp';
 drop table t1;
---replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 restore table t1 from '../bogus';
 restore table t1 from '../tmp';
 select n from t1;
@@ -55,6 +55,6 @@
 connection con1;
 reap;
 drop table t5;
---system rm $MYSQL_TEST_DIR/var/tmp/t?.*
+--system rm $MYSQLTEST_VARDIR/tmp/t?.*
 
 # End of 4.1 tests

--- 1.64/mysql-test/t/rpl_rotate_logs.test	2005-12-22 05:10:53 +01:00
+++ 1.65/mysql-test/t/rpl_rotate_logs.test	2006-01-24 13:56:46 +01:00
@@ -17,8 +17,8 @@
 drop table if exists t1, t2, t3, t4;
 --enable_warnings
 connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
-system cat /dev/null > var/slave-data/master.info;
-system chmod 000 var/slave-data/master.info;
+system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
+system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
 connection slave;
 --disable_warnings
 drop table if exists t1, t2, t3, t4;
@@ -29,7 +29,7 @@
 --replace_result $MYSQL_TEST_DIR TESTDIR
 --error 1105,1105,29
 start slave;
-system chmod 600 var/slave-data/master.info;
+system chmod 600  $MYSQLTEST_VARDIR/slave-data/master.info;
 # It will fail again because the file is empty so the slave cannot get valuable
 # info about how to connect to the master from it (failure in
 # init_strvar_from_file() in init_master_info()).

--- 1.27.1.1/mysql-test/t/rpl_log.test	2006-01-24 08:30:49 +01:00
+++ 1.29/mysql-test/extra/rpl_tests/rpl_log.test	2006-01-24 13:56:43 +01:00
@@ -1,4 +1,5 @@
-source include/master-slave.inc;
+# Requires statement logging
+-- source include/master-slave.inc
 
 # Clean up old slave's binlogs.
 # The slave is started with --log-slave-updates
@@ -37,10 +38,14 @@
 select count(*) from t1;
 drop table t1;
 --replace_result $VERSION VERSION
+--replace_column 2 # 5 #
 show binlog events;
-show binlog events from 98 limit 1;
-show binlog events from 98 limit 2;
-show binlog events from 98 limit 2,1;
+--replace_column 2 # 5 #
+show binlog events from 102 limit 1;
+--replace_column 2 # 5 #
+show binlog events from 102 limit 2;
+--replace_column 2 # 5 #
+show binlog events from 102 limit 2,1;
 flush logs;
 
 # We need an extra update before doing save_master_pos.
@@ -81,8 +86,10 @@
 insert into t1 values (1);
 drop table t1;
 --replace_result $VERSION VERSION
+--replace_column 2 # 5 #
 show binlog events;
 --replace_result $VERSION VERSION
+--replace_column 2 # 5 #
 show binlog events in 'master-bin.000002';
 show binary logs;
 save_master_pos;
@@ -91,11 +98,13 @@
 sync_with_master;
 show binary logs;
 --replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
+--replace_column 2 # 5 #
 show binlog events in 'slave-bin.000001' from 4;
 --replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
+--replace_column 2 # 5 #
 show binlog events in 'slave-bin.000002' from 4;
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 8 # 9 # 23 # 33 #
+--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
 show slave status;
 
 # Need to recode the following
@@ -108,6 +117,3 @@
 
 --error 1220
 show binlog events in 'slave-bin.000005' from 4;
-
-# End of 4.1 tests
-# Adding comment for force manual merge 5.0 -> wl1012: Delete me
Thread
bk commit into 5.1 tree (msvensson:1.2072)msvensson24 Jan