bk commit into 5.0 tree (aelkin:1.2563) BUG#30435

[Andrei Elkin]

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

ChangeSet@stripped, 2007-12-22 19:59:47+02:00, aelkin@stripped +2 -0
  bug#30435
  
  refining the test after it failed on pb.

  mysql-test/r/rpl_loaddata_map.result@stripped, 2007-12-22 19:59:39+02:00, aelkin@stripped +2 -2
    results changed

  mysql-test/t/rpl_loaddata_map.test@stripped, 2007-12-22 19:59:39+02:00, aelkin@stripped +2 -0
    refining the test

diff -Nrup a/mysql-test/r/rpl_loaddata_map.result b/mysql-test/r/rpl_loaddata_map.result
--- a/mysql-test/r/rpl_loaddata_map.result	2007-12-21 22:34:40 +02:00
+++ b/mysql-test/r/rpl_loaddata_map.result	2007-12-22 19:59:39 +02:00
@@ -11,7 +11,7 @@ max_allowed_packet	7168
 show variables like 'read_buffer_size'   /* 9K */;
 Variable_name	Value
 read_buffer_size	8228
-load data infile '/home/elkin/MySQL/TEAM/FIXES/5.0/bug33435-load_data_read_buffer_size/mysql-test/var/tmp/bug30435_5k.txt' into table t2;
+load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
 select count(*) from t2 /* 5 000 */;
 count(*)
 5000
@@ -23,7 +23,7 @@ master-bin.000002	7412	Append_block	1	#	
 master-bin.000002	14603	Append_block	1	#	;file_id=1;block_len=2048
 master-bin.000002	16674	Append_block	1	#	;file_id=1;block_len=7168
 master-bin.000002	23865	Append_block	1	#	;file_id=1;block_len=341
-master-bin.000002	24229	Execute_load_query	1	#	use `test`; load data infile '/home/elkin/MySQL/TEAM/FIXES/5.0/bug33435-load_data_read_buffer_size/mysql-test/var/tmp/bug30435_5k.txt' into table t2 ;file_id=1
+master-bin.000002	24229	Execute_load_query	1	#	use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=1
 select count(*) from t2 /* 5 000 */;
 count(*)
 5000
diff -Nrup a/mysql-test/t/rpl_loaddata_map.test b/mysql-test/t/rpl_loaddata_map.test
--- a/mysql-test/t/rpl_loaddata_map.test	2007-12-21 22:34:41 +02:00
+++ b/mysql-test/t/rpl_loaddata_map.test	2007-12-22 19:59:39 +02:00
@@ -29,6 +29,7 @@ create table t2 (id int not null primary
 show variables like 'max_allowed_packet' /* 8K */;
 show variables like 'read_buffer_size'   /* 9K */;
 
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval load data infile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
 select count(*) from t2 /* 5 000 */;
 
@@ -36,6 +37,7 @@ select count(*) from t2 /* 5 000 */;
 --let $binlog_start=98
 --replace_column 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --eval show binlog events in 'master-bin.000002' from $binlog_start