BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed

This patch corrects a bug involving a LOAD DATA INFILE operation on a 
transactional table. It corrects a problem in the error handler moving
the transactional table check and autocommit_or_rollback operation to the 
end of the error handler. An additional test case was added to detect this
condition.


mysql-test/r/rpl_loaddata.result:
  BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
  
  This patch adds the results for the additional test for properly handling the
  duplicate key error on LOAD DATA INFILE.
mysql-test/t/rpl_loaddata.test:
  BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
  
  This patch adds an additional test to rpl_loaddata for handling the
  duplicate key error on LOAD DATA INFILE.
sql/sql_load.cc:
  BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
  
  This patch moves the check for a transactional table and rollback in the
  error handler for mysql_load(). The patch moves the transactional table
  check to the end of the error handler matching the implementation for other
  similar operations (see sql_insert).

mysql-test/r/rpl_loaddata.result

@@ -80,3 +80,7 @@ ERROR 23000: Duplicate entry '2003-03-22' for key 1
 drop table t2;
 drop table t2;
 drop table t1;
+CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
+LOAD DATA INFILE "../std_data_ln/words.dat" INTO TABLE t1;
+ERROR 23000: Duplicate entry 'Aarhus' for key 1
+DROP TABLE IF EXISTS t1;

mysql-test/t/rpl_loaddata.test

@@ -12,6 +12,7 @@
 # Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986)
 
 source include/master-slave.inc;
+source include/have_innodb.inc;
 
 connection slave;
 reset master;
@@ -150,5 +151,16 @@ drop table t2;
 connection master;
 drop table t2;
 drop table t1;
+
+# BUG#17233 LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed
+CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
+
+--error 1062
+LOAD DATA INFILE "../std_data_ln/words.dat" INTO TABLE t1;
+
+--disable warnings
+DROP TABLE IF EXISTS t1;
+--enable warnings
+
 sync_with_master;
 # End of 4.1 tests

sql/sql_load.cc

@@ -414,9 +414,6 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
 
   if (error)
   {
-    if (transactional_table)
-      ha_autocommit_or_rollback(thd,error);
-
     if (read_file_from_client)
       while (!read_info.next_line())
 	;
@@ -460,6 +457,9 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
       }
     }
 #endif /*!EMBEDDED_LIBRARY*/
+    if (transactional_table)
+      ha_autocommit_or_rollback(thd,error);
+
     error= -1;				// Error on read
     goto err;
   }