diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 12:53:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 12:53:23 +0200 |
| commit | 7bc1d892038f170f90448a08292153bc2456f504 (patch) | |
| tree | 28d4cff53bc2ea27de7b3461c91aa1c5e7f496b3 /mysql-test/t/rpl_loaddata.test | |
| parent | 6eedec6889e8e7c080be4f6ff896a9b3e4c6cf6d (diff) | |
| parent | 126e351cde084ae36d9e803c740bf07c7054c577 (diff) | |
| download | mariadb-git-7bc1d892038f170f90448a08292153bc2456f504.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/rpl_flush_log_loop.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_drop_temp.test:
Auto merged
mysql-test/t/rpl_error_ignored_table.test:
Auto merged
mysql-test/t/rpl_flush_log_loop.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/r/mysqltest.result:
Manual merge
mysql-test/t/flush.test:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
mysql-test/t/rpl_change_master.test:
Manual merge
mysql-test/t/rpl_until.test:
Manual merge
Diffstat (limited to 'mysql-test/t/rpl_loaddata.test')
| -rw-r--r-- | mysql-test/t/rpl_loaddata.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test index 3d54897adda..baa8dbec09d 100644 --- a/mysql-test/t/rpl_loaddata.test +++ b/mysql-test/t/rpl_loaddata.test @@ -124,7 +124,7 @@ connection master; reset master; create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60), unique(day)) engine=MyISAM; # no transactions ---error 1062; +--error 1062 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; |