Skip to content

M
MariaDB
Commit 8f5467d1 authored by pekka@mysql.com's avatar pekka@mysql.com
Browse files
Options

Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 

into  mysql.com:/space/pekka/ndb/version/my51-bug14509
parents 852c0dbf fc732046
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/ndb/src/ndbapi/Ndb.cpp
View file @ 8f5467d1
...@@ -921,13 +921,13 @@ Ndb::setTupleIdInNdb(Ndb_local_table_info* info, Uint64 val, bool increase) ...@@ -921,13 +921,13 @@ Ndb::setTupleIdInNdb(Ndb_local_table_info* info, Uint64 val, bool increase)
* if value <= NEXTID, do nothing. otherwise update NEXTID to * if value <= NEXTID, do nothing. otherwise update NEXTID to
* value and set cached range to first = last = value - 1. * value and set cached range to first = last = value - 1.
*/ */
DBUG_RETURN((opTupleIdOnNdb(info, val, 2) == val)); DBUG_RETURN((opTupleIdOnNdb(info, val, 2)));
} }
else else
/* /*
* update NEXTID to given value. reset cached range. * update NEXTID to given value. reset cached range.
*/ */
DBUG_RETURN((opTupleIdOnNdb(info, val, 1) == val)); DBUG_RETURN((opTupleIdOnNdb(info, val, 1)));
} }
int Ndb::initAutoIncrement() int Ndb::initAutoIncrement()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7