diff options
| author | jmiller@mysql.com <> | 2006-02-08 16:52:34 +0100 |
|---|---|---|
| committer | jmiller@mysql.com <> | 2006-02-08 16:52:34 +0100 |
| commit | e3bfdb9b1cbc0f629dc899c72efc761d21757d31 (patch) | |
| tree | 8b4372ae8f68d09491d85c5ea3e29f7f40939452 /mysql-test/r/rpl_replicate_do.result | |
| parent | dacf64b6780be14c38b81e3c13228df0d3e60fa7 (diff) | |
| parent | 0831fd611e7c11c12af844665bf90399fe559d04 (diff) | |
| download | mariadb-git-e3bfdb9b1cbc0f629dc899c72efc761d21757d31.tar.gz | |
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
Diffstat (limited to 'mysql-test/r/rpl_replicate_do.result')
| -rw-r--r-- | mysql-test/r/rpl_replicate_do.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_replicate_do.result b/mysql-test/r/rpl_replicate_do.result index 9f7e1a81507..43e7c6779bf 100644 --- a/mysql-test/r/rpl_replicate_do.result +++ b/mysql-test/r/rpl_replicate_do.result @@ -9,7 +9,7 @@ drop table if exists t11; create table t2 (n int); insert into t2 values(4); create table t2 (s char(20)); -load data infile '../../std_data/words.dat' into table t2; +load data infile '../std_data_ln/words.dat' into table t2; insert into t2 values('five'); create table t1 (m int); insert into t1 values(15),(16),(17); @@ -40,3 +40,4 @@ set one_shot time_zone='met'; select * from t1; ts 2005-08-12 00:00:00 +drop table t1; |