Commit 484f5696 authored by unknown's avatar unknown
Browse files

Update 5.1 to use MYSQLTEST_VARDIR 


mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Update to use std_data_ln
mysql-test/mysql-test-run.pl:
  Add back variable path_mysqltest_log
mysql-test/r/rpl_loaddata.result:
  Binlog offset changed when using std_data_ln instead of std_data
mysql-test/r/rpl_stm_log.result:
  Binlog offset changed when using std_data_ln instead of std_data
parent c1b598cc

mysql-test/extra/rpl_tests/rpl_loaddata.test

+7 −7
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ reset master; 
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 @@ sync_with_master; 
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 @@ connection master; 
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 @@ connection master; 
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 @@ reset master; 
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 @@ alter table t2 drop key day; 
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;

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ our $path_client_bindir; 
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

mysql-test/r/rpl_loaddata.result

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ day id category name 
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;

mysql-test/r/rpl_stm_log.result

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ master-bin.000002 514 
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