bk commit into 4.1 tree (mskold:1.2173) BUG#9675

[Martin Skold]

Below is the list of changes that have just been committed into a local
4.1 repository of marty. When marty 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.2173 05/04/07 20:08:01 mskold@stripped +1 -0
  Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post
review fix

  sql/ha_ndbcluster.cc
    1.138 05/04/07 20:07:44 mskold@stripped +4 -1
    Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post
review fix

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-4.1

--- 1.137/sql/ha_ndbcluster.cc	Thu Apr  7 17:43:51 2005
+++ 1.138/sql/ha_ndbcluster.cc	Thu Apr  7 20:07:44 2005
@@ -3933,7 +3933,10 @@
   DBUG_ENTER("get_auto_increment");
   DBUG_PRINT("enter", ("m_tabname: %s", m_tabname));
   Ndb *ndb= get_ndb();
-
+  
+  if (m_rows_inserted > m_rows_to_insert)
+    /* We guessed too low */
+    m_rows_to_insert+= m_autoincrement_prefetch;
   int cache_size= 
     (m_rows_to_insert - m_rows_inserted < m_autoincrement_prefetch) ?
     m_rows_to_insert - m_rows_inserted