database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Update 5.1 to use MYSQLTEST_VARDIR

Browse Source 
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
This commit is contained in:
unknown
2006-01-26 12:35:36 +01:00
parent c1b598ccb9
commit 484f56967a
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/extra/rpl_tests/rpl_loaddata.test
View File

@ -21,10 +21,10 @@ reset master;
connection master; connection master;
create table t1(a int not null auto_increment, b int, primary key(a) ); 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)); 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)); create table t3 (day date,id int(9),category enum('a','b','c'),name varchar(60));
insert into t3 select * from t2; insert into t3 select * from t2;
@ -59,7 +59,7 @@ sync_with_master;
insert into t1 values(1,10); insert into t1 values(1,10);
connection master; 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; save_master_pos;
connection slave; connection slave;
@ -83,7 +83,7 @@ connection master;
set sql_log_bin=0; set sql_log_bin=0;
delete from t1; delete from t1;
set sql_log_bin=1; 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; save_master_pos;
connection slave; connection slave;
# The SQL slave thread should be stopped now. # The SQL slave thread should be stopped now.
@ -108,7 +108,7 @@ connection master;
set sql_log_bin=0; set sql_log_bin=0;
delete from t1; delete from t1;
set sql_log_bin=1; 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; save_master_pos;
connection slave; connection slave;
# The SQL slave thread should be stopped now. # 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), eval create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
unique(day)) engine=$engine_type; # no transactions unique(day)) engine=$engine_type; # no transactions
--error 1062 --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 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
'\n##\n' starting by '>' ignore 1 lines; '\n##\n' starting by '>' ignore 1 lines;
select * from t2; select * from t2;
@ -144,7 +144,7 @@ alter table t2 drop key day;
connection master; connection master;
delete from t2; delete from t2;
--error 1062 --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 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
'\n##\n' starting by '>' ignore 1 lines; '\n##\n' starting by '>' ignore 1 lines;
connection slave; connection slave;

2
mysql-test/mysql-test-run.pl
View File

@ -157,7 +157,7 @@ our $path_client_bindir;
our $path_language; our $path_language;
our $path_timefile; our $path_timefile;
our $path_manager_log; # Used by mysqldadmin our $path_manager_log; # Used by mysqldadmin
our $path_slave_load_tmpdir; # What is this?! our $path_mysqltest_log;
our $path_my_basedir; our $path_my_basedir;
our $opt_vardir; # A path but set directly on cmd line our $opt_vardir; # A path but set directly on cmd line
our $opt_tmpdir; # A path but set directly on cmd line our $opt_tmpdir; # A path but set directly on cmd line

2
mysql-test/r/rpl_loaddata.result
View File

@ -22,7 +22,7 @@ day id category name
2003-03-22 2416 a bbbbb 2003-03-22 2416 a bbbbb
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
slave-bin.000001 1290 slave-bin.000001 1276
drop table t1; drop table t1;
drop table t2; drop table t2;
drop table t3; drop table t3;

2
mysql-test/r/rpl_stm_log.result
View File

@ -74,7 +74,7 @@ master-bin.000002 514
start slave; start slave;
show binary logs; show binary logs;
Log_name File_size Log_name File_size
slave-bin.000001 1563 slave-bin.000001 1556
slave-bin.000002 352 slave-bin.000002 352
show binlog events in 'slave-bin.000001' from 4; show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info