Commit caa335bc authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/space/pekka/ndb/version/my51-bug14509


storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
parents 02f31c55 864bd283

storage/ndb/src/ndbapi/Ndb.cpp

+2 −2
Original line number Diff line number Diff line
@@ -921,13 +921,13 @@ Ndb::setTupleIdInNdb(Ndb_local_table_info* info, Uint64 val, bool increase) 
     * if value <= NEXTID, do nothing.  otherwise update NEXTID to

     * value and set cached range to first = last = value - 1.

     */

    DBUG_RETURN((opTupleIdOnNdb(info, val, 2) == val));

    DBUG_RETURN((opTupleIdOnNdb(info, val, 2)));

  }

  else

    /*

     * update NEXTID to given value.  reset cached range.

     */

    DBUG_RETURN((opTupleIdOnNdb(info, val, 1) == val));

    DBUG_RETURN((opTupleIdOnNdb(info, val, 1)));

}



int Ndb::initAutoIncrement()