diff options
| author | unknown <jmiller@mysql.com> | 2006-02-08 16:52:34 +0100 |
|---|---|---|
| committer | unknown <jmiller@mysql.com> | 2006-02-08 16:52:34 +0100 |
| commit | 6524330944c3b19158978c6b558dd11466801d33 (patch) | |
| tree | 8b4372ae8f68d09491d85c5ea3e29f7f40939452 /mysql-test/extra/rpl_tests/rpl_log.test | |
| parent | 043ad0670ff4a760477f880b98c11006d9e9bc3e (diff) | |
| parent | b38ec6f44adadef5e8838da24614edc60d08758b (diff) | |
| download | mariadb-git-6524330944c3b19158978c6b558dd11466801d33.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
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_row_log.result:
Auto merged
mysql-test/r/rpl_skip_error.result:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/rpl_skip_error.test:
Auto merged
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a:
Auto merged
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734:
Auto merged
mysql-test/t/rpl_load_from_master.test:
Auto merged
Diffstat (limited to 'mysql-test/extra/rpl_tests/rpl_log.test')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_log.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index 1e5074d9260..7f1c50aaf0e 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -34,7 +34,7 @@ eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_ty insert into t1 values (NULL); drop table t1; eval create table t1 (word char(20) not null)ENGINE=$engine_type; -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 |