1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

Browse Source 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/handler.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
storage/ndb/src/ndbapi/Ndb.cpp:
  Merge
This commit is contained in:
unknown 2007-06-14 16:18:40 +02:00
commit d442b5a59e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/ndb/src/ndbapi/Ndb.cpp
View File

@ -886,8 +886,8 @@ Ndb::getTupleIdFromNdb(const NdbTableImpl* table,
DBUG_PRINT("info", ("Next value fetched from database %lu", (ulong) opValue)); 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)); DBUG_PRINT("info", ("Increasing %lu by offset %lu, increment is %lu", (ulong) (ulong) opValue, (ulong) offset, (ulong) step));
Uint64 current, next; Uint64 current, next;
next = ((Uint64) (opValue + step - offset)) / step; Uint64 div = ((Uint64) (opValue + step - offset)) / step;
next = next * step + offset; next = div * step + offset;
current = (next < step) ? next : next - step; current = (next < step) ? next : next - step;
tupleId = (opValue <= current) ? current : next; tupleId = (opValue <= current) ? current : next;
DBUG_PRINT("info", ("Returning %lu", (ulong) tupleId)); DBUG_PRINT("info", ("Returning %lu", (ulong) tupleId));