From d204dc2d216bb35cfa4f2337d7dd4faddf34dacb Mon Sep 17 00:00:00 2001
From: "gbichot@dl145h.mysql.com" <>
Date: Mon, 26 Feb 2007 20:35:28 +0100
Subject: [PATCH] Fix for BUG#26050 "LOAD DATA INFILE breaks ACID"; the ok must
 be sent to the client only after the binlog write and engine commit. No
 testcase for this bug, as to reproduce it, we need to "kill -9" mysqld, which
 we cannot do in the testsuite. But, I tested by hand.

---
 sql/sql_load.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 5710f9c4c97..10124e5f5ff 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -353,7 +353,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   }
   sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted,
 	  (ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
-  send_ok(thd,info.copied+info.deleted,0L,name);
   // on the slave thd->query is never initialized
   if (!thd->slave_thread)
     mysql_update_log.write(thd,thd->query,thd->query_length);
@@ -378,6 +377,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
 #endif /*!EMBEDDED_LIBRARY*/
   if (transactional_table)
     error=ha_autocommit_or_rollback(thd,error); 
+
+  /* ok to client sent only after binlog write and engine commit */
+  send_ok(thd, info.copied + info.deleted, 0L, name);
 err:
   if (thd->lock)
   {