From: Date: September 20 2005 2:20pm
Subject: bk commit into 4.1 tree (tomas:1.2446) BUG#10694
List-Archive: http://lists.mysql.com/internals/30095
X-Bug: 10694
Message-Id: <20050920122009.E73F81F35B3@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.2446 05/09/20 14:20:02 tomas@stripped +1 -0
  Bug #10694  	LOAD DATA FROM INFILE fails with 'Out of operation records'

  sql/sql_load.cc
    1.84 05/09/20 14:19:58 tomas@stripped +5 -2
    Bug #10694  	LOAD DATA FROM INFILE fails with 'Out of operation records'

# 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.83/sql/sql_load.cc	2004-12-31 11:04:30 +01:00
+++ 1.84/sql/sql_load.cc	2005-09-20 14:19:58 +02:00
@@ -114,6 +114,10 @@
 	       MYF(0));
     DBUG_RETURN(-1);
   }
+  /*
+    This needs to be done before external_lock
+  */
+  ha_enable_transaction(thd, FALSE); 
   if (!(table = open_ltable(thd,table_list,lock_type)))
     DBUG_RETURN(-1);
   transactional_table= table->file->has_transactions();
@@ -273,7 +277,6 @@
     if (ignore ||
 	handle_duplicates == DUP_REPLACE)
       table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
-    ha_enable_transaction(thd, FALSE); 
     table->file->start_bulk_insert((ha_rows) 0);
     table->copy_blobs=1;
     if (!field_term->length() && !enclosed->length())
@@ -284,10 +287,10 @@
 			   skip_lines);
     if (table->file->end_bulk_insert())
       error=1;					/* purecov: inspected */
-    ha_enable_transaction(thd, TRUE);
     table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
     table->next_number_field=0;
   }
+  ha_enable_transaction(thd, TRUE);
   if (file >= 0)
     my_close(file,MYF(0));
   free_blobs(table);				/* if pack_blob was used */