diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:15:37 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:15:37 +0200 |
| commit | 4fed17727655091622b0244c9a127010cab719a9 (patch) | |
| tree | 80ada8364981cc5d65dec53d473583b35d07abe6 /mysql-test/t/rpl_loaddata.test | |
| parent | f5db9c9a5be0f2f7f78229e2b6054aae3d940c1c (diff) | |
| parent | e2965fb2628c9d4e557d755eeca0bc24b43fb353 (diff) | |
| download | mariadb-git-4fed17727655091622b0244c9a127010cab719a9.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
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/mysqltest.result:
Auto merged
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb-deadlock.test:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/kill.test:
Auto merged
mysql-test/t/ndb_autodiscover2.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_drop.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_insert_id.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
mysql-test/t/rpl_until.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
client/mysqltest.c:
Merge with --parsing-disabled
mysql-test/t/mysqltest.test:
Manual merge
Diffstat (limited to 'mysql-test/t/rpl_loaddata.test')
| -rw-r--r-- | mysql-test/t/rpl_loaddata.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test index 1b5980eb92e..00121092bbf 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; @@ -140,7 +140,7 @@ select * from t2; alter table t2 drop key day; connection master; delete from t2; ---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; |