From: Date: February 7 2006 11:30am
Subject: bk commit into 4.1 tree (tomas:1.2474) BUG#17081
List-Archive: http://lists.mysql.com/commits/2222
X-Bug: 17081
Message-Id: <20060207103049.96764817D1@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2474 06/02/07 11:30:42 tomas@stripped +1 -0
  Bug #17081  	"LOAD DATA INFILE" may not load all the data

  sql/ha_ndbcluster.cc
    1.178 06/02/07 11:30:38 tomas@stripped +5 -2
    Bug #17081  	"LOAD DATA INFILE" may not load all the data

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1

--- 1.177/sql/ha_ndbcluster.cc	2006-02-07 00:03:34 +01:00
+++ 1.178/sql/ha_ndbcluster.cc	2006-02-07 11:30:38 +01:00
@@ -3061,8 +3061,11 @@
         no_uncommitted_rows_execute_failure();
         my_errno= error= ndb_err(trans);
       }
-      int res= trans->restart();
-      DBUG_ASSERT(res == 0);
+      else
+      {
+        int res= trans->restart();
+        DBUG_ASSERT(res == 0);
+      }
     }
   }