Commit f3f5a55c authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql-4.0 

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents 71b8ce36 5a487ccd

mysql-test/r/rpl000001.result

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use test; 
drop table if exists t1,t3;

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

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

 load data local infile '/home/sasha/bk/mysql-4.0/mysql-test/std_data/words.dat' into table t1;

 load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1;

select * from t1;

word

Aarhus

mysql-test/t/rpl000001.test

+1 −0
Original line number Diff line number Diff line 
eval_result;

source include/master-slave.inc;

connection master;

use test;