bk commit into 5.1 tree (msvensson:1.2074)

[msvensson]

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.2074 06/01/26 12:35:36 msvensson@neptunus.(none) +4 -0
  Update 5.1 to use MYSQLTEST_VARDIR

  mysql-test/r/rpl_stm_log.result
    1.65 06/01/26 12:35:30 msvensson@neptunus.(none) +1 -1
    Binlog offset changed when using std_data_ln instead of std_data

  mysql-test/r/rpl_loaddata.result
    1.31 06/01/26 12:35:30 msvensson@neptunus.(none) +1 -1
    Binlog offset changed when using std_data_ln instead of std_data

  mysql-test/mysql-test-run.pl
    1.59 06/01/26 12:35:29 msvensson@neptunus.(none) +1 -1
    Add back variable path_mysqltest_log

  mysql-test/extra/rpl_tests/rpl_loaddata.test
    1.2 06/01/26 12:35:29 msvensson@neptunus.(none) +7 -7
    Update to use std_data_ln

# 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

--- 1.58/mysql-test/mysql-test-run.pl	2006-01-24 14:10:44 +01:00
+++ 1.59/mysql-test/mysql-test-run.pl	2006-01-26 12:35:29 +01:00
@@ -157,7 +157,7 @@
 our $path_language;
 our $path_timefile;
 our $path_manager_log;           # Used by mysqldadmin
-our $path_slave_load_tmpdir;     # What is this?!
+our $path_mysqltest_log; 
 our $path_my_basedir;
 our $opt_vardir;                 # A path but set directly on cmd line
 our $opt_tmpdir;                 # A path but set directly on cmd line

--- 1.1/mysql-test/extra/rpl_tests/rpl_loaddata.test	2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_loaddata.test	2006-01-26 12:35:29 +01:00
@@ -21,10 +21,10 @@
 connection 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;
@@ -59,7 +59,7 @@
 insert into t1 values(1,10);
 
 connection master;
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
 
 save_master_pos;
 connection slave;
@@ -83,7 +83,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;
 save_master_pos;
 connection slave;
 # The SQL slave thread should be stopped now. 
@@ -108,7 +108,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;
 save_master_pos;
 connection slave;
 # The SQL slave thread should be stopped now.
@@ -128,7 +128,7 @@
 eval create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
 unique(day)) engine=$engine_type; # no transactions
 --error 1062
-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;
 select * from t2;
@@ -144,7 +144,7 @@
 connection master;
 delete from t2;
 --error 1062
-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;
 connection slave;

--- 1.30/mysql-test/r/rpl_loaddata.result	2006-01-24 14:10:44 +01:00
+++ 1.31/mysql-test/r/rpl_loaddata.result	2006-01-26 12:35:30 +01:00
@@ -22,7 +22,7 @@
 2003-03-22	2416	a	bbbbb
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-slave-bin.000001	1290		
+slave-bin.000001	1276		
 drop table t1;
 drop table t2;
 drop table t3;

--- 1.64/mysql-test/r/rpl_stm_log.result	2006-01-24 14:10:44 +01:00
+++ 1.65/mysql-test/r/rpl_stm_log.result	2006-01-26 12:35:30 +01:00
@@ -74,7 +74,7 @@
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1563
+slave-bin.000001	1556
 slave-bin.000002	352
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info