summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_loaddata.result
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-09-25 00:14:46 +0200
committerunknown <guilhem@mysql.com>2003-09-25 00:14:46 +0200
commit9277b87647a6b55040b644e5705bde53b0e692cb (patch)
tree5d0a4646226c2ebce870b175a81f47d772220f12 /mysql-test/r/rpl_loaddata.result
parentbb62c6f26b5f68fd2948f1866a9cd097b40f118c (diff)
downloadmariadb-git-9277b87647a6b55040b644e5705bde53b0e692cb.tar.gz
Fix for BUG#1391:
"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files" (the bug is in the master) mysql-test/r/rpl_loaddata.result: result update mysql-test/std_data/rpl_loaddata2.dat: change to introduce a unique key violation mysql-test/t/rpl_loaddata.test: testcase for bug#1391. sql/sql_load.cc: fix for bug#1391: for a small file, we had in the binlog only the Create_file, not the Delete_file (the Create_file was written when the READ_INFO was destroyed).
Diffstat (limited to 'mysql-test/r/rpl_loaddata.result')
-rw-r--r--mysql-test/r/rpl_loaddata.result13
1 files changed, 12 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
index 0302381c119..8b910d0d183 100644
--- a/mysql-test/r/rpl_loaddata.result
+++ b/mysql-test/r/rpl_loaddata.result
@@ -19,7 +19,7 @@ select * from t3;
day id category name
2003-02-22 2461 b a a a @ %  ' " a
2003-03-22 2161 c asdf
-2003-04-22 2416 a bbbbb
+2003-03-22 2416 a bbbbb
show master status;
File Position Binlog_do_db Binlog_ignore_db
slave-bin.001 964
@@ -55,3 +55,14 @@ reset slave;
show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 4 slave-relay-bin.001 4 No No 0 0 0 4
+reset master;
+create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
+unique(day));
+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;
+Duplicate entry '2003-03-22' for key 1
+show master status;
+File Position Binlog_do_db Binlog_ignore_db
+master-bin.001 491
+drop table t2;