bk commit into 5.0 tree (mskold:1.2504) BUG#26342

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2007-06-14 16:01:51+02:00, mskold@stripped +1 -0
  Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB
cluster, implemented support for auto_increment_offset and auto_increment_increment for
Ndb, post review fix

  ndb/src/ndbapi/Ndb.cpp@stripped, 2007-06-14 16:01:39+02:00, mskold@stripped +2 -2
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB
cluster, implemented support for auto_increment_offset and auto_increment_increment for
Ndb, 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:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.0-ndb

--- 1.70/ndb/src/ndbapi/Ndb.cpp	2007-06-14 16:02:03 +02:00
+++ 1.71/ndb/src/ndbapi/Ndb.cpp	2007-06-14 16:02:03 +02:00
@@ -882,8 +882,8 @@ Ndb::getTupleIdFromNdb(Ndb_local_table_i
     DBUG_PRINT("info", ("Next value fetched from database %lu", (ulong) opValue));
     DBUG_PRINT("info", ("Increasing %lu by offset %lu, increment  is %lu", (ulong)
(ulong) opValue, (ulong) offset, (ulong) step));
     Uint64 current, next;
-    next = ((Uint64) (opValue + step - offset)) / step;
-    next = next * step + offset;
+    Uint64 div = ((Uint64) (opValue + step - offset)) / step;
+    next = div * step + offset;
     current = (next < step) ? next : next - step;
     tupleId = (opValue <= current) ? current : next;
     DBUG_PRINT("info", ("Returning %lu", (ulong) tupleId));