bk commit into 5.1 tree (tomas:1.2537)

[tomas]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2007-06-15 09:18:44+02:00, tomas@stripped +2 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-wl3867
  MERGE: 1.2514.1.32

  sql/ha_ndbcluster.cc@stripped, 2007-06-15 09:18:39+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.472.1.1

  sql/handler.h@stripped, 2007-06-15 09:18:39+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.258.1.2

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl3867/RESYNC

--- 1.259/sql/handler.h	2007-05-28 14:42:52 +02:00
+++ 1.260/sql/handler.h	2007-06-15 09:18:39 +02:00
@@ -1668,7 +1668,6 @@
     but we don't have a primary key
   */
   virtual void use_hidden_primary_key();
-
 private:
   /*
     Row-level primitives for storage engines.  These should be

--- 1.478/sql/ha_ndbcluster.cc	2007-06-08 22:22:17 +02:00
+++ 1.479/sql/ha_ndbcluster.cc	2007-06-15 09:18:39 +02:00
@@ -6796,7 +6796,7 @@
                                        ulonglong nb_desired_values,
                                        ulonglong *first_value,
                                        ulonglong *nb_reserved_values)
-{  
+{
   int cache_size;
   Uint64 auto_value;
   DBUG_ENTER("get_auto_increment");
@@ -6820,7 +6820,7 @@
     Ndb_tuple_id_range_guard g(m_share);
     if (m_skip_auto_increment &&
         ndb->readAutoIncrementValue(m_table, g.range, auto_value) ||
-        ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size))
+        ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size, increment, offset))
     {
       if (--retries &&
           ndb->getNdbError().status == NdbError::TemporaryError);