summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_loaddata.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-09-01 17:01:23 +0200
committerunknown <msvensson@neptunus.(none)>2005-09-01 17:01:23 +0200
commite2965fb2628c9d4e557d755eeca0bc24b43fb353 (patch)
treed05f731fdf5db3f807667cbb59f41f497da23ead /mysql-test/t/rpl_loaddata.test
parent7bc1d892038f170f90448a08292153bc2456f504 (diff)
downloadmariadb-git-e2965fb2628c9d4e557d755eeca0bc24b43fb353.tar.gz
mysqltest improvements, updates after merge + test for 5.0
client/mysqltest.c: Fixes after merge mysql-test/r/type_newdecimal.result: Update results after correction of testcase mysql-test/t/flush_read_lock_kill.test: Found extra delimiter mysql-test/t/kill.test: Found extra delimiter mysql-test/t/rpl_loaddata.test: Found extra delimiter mysql-test/t/rpl_sp.test: Found extra delimiter mysql-test/t/strict.test: Convert "!$1292" to "--error 1292" mysql-test/t/type_newdecimal.test: Missing ;
Diffstat (limited to 'mysql-test/t/rpl_loaddata.test')
-rw-r--r--mysql-test/t/rpl_loaddata.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test
index baa8dbec09d..1da41bfa913 100644
--- a/mysql-test/t/rpl_loaddata.test
+++ b/mysql-test/t/rpl_loaddata.test
@@ -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;