Commit 793cea87 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 

into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
parents 8fbc7ef0 484f5696

mysql-test/extra/binlog_tests/blackhole.test

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ insert into t1 values(1); 
insert ignore into t1 values(1);

replace into t1 values(100);

create table t2 (a varchar(200)) engine=blackhole;

load data infile '../../std_data/words.dat' into table t2;

load data infile '../std_data_ln/words.dat' into table t2;

alter table t1 add b int;

alter table t1 drop b;

create table t3 like t1;

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ show binlog events from 102; 
# 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 t2;



# End of 4.1 tests

mysql-test/extra/rpl_tests/rpl_EE_err.test

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


eval create table t1 (a int) engine=$engine_type;

flush tables;

system rm ./var/master-data/test/t1.MYI ;

system rm $MYSQLTEST_VARDIR/master-data/test/t1.MYI ;

drop table if exists t1;

save_master_pos;

connection slave;

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/extra/rpl_tests/rpl_log.test

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ create table t1(n int not null auto_increment primary key); 
insert into t1 values (NULL);

drop table t1;

create table t1 (word char(20) not null);

load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;

load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;

select count(*) from t1;

drop table t1;

--replace_result $VERSION VERSION