Commit 02f31c55 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/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  use local, weird diff
parents e60119f8 0219f8b0

sql/ha_ndbcluster.cc

+5 −5
Original line number Diff line number Diff line
@@ -2563,11 +2563,11 @@ int ha_ndbcluster::write_row(byte *record) 
    Ndb *ndb= get_ndb();

    Uint64 next_val= (Uint64) table->next_number_field->val_int() + 1;

    DBUG_PRINT("info", 

               ("Trying to set next auto increment value to %lu",

                (ulong) next_val));

    if (ndb->setAutoIncrementValue(m_table, next_val, TRUE))

      DBUG_PRINT("info", 

                 ("Setting next auto increment value to %u", next_val));  

               ("Trying to set next auto increment value to %llu",

                (ulonglong) next_val));

    if (ndb->setAutoIncrementValue(m_table, next_val, TRUE)

        == ~(Uint64)0)

      ERR_RETURN(ndb->getNdbError());

  }

  m_skip_auto_increment= TRUE;

storage/ndb/include/ndbapi/Ndb.hpp

+6 −6
Original line number Diff line number Diff line
@@ -1469,7 +1469,7 @@ public: 
   *

   * @param cacheSize number of values to cache in this Ndb object

   *

   * @return tuple id or 0 on error

   * @return tuple id or ~(Uint64)0 on error.

   */

  int initAutoIncrement();
@@ -1479,14 +1479,14 @@ public: 
			       Uint32 cacheSize = 1);

  Uint64 readAutoIncrementValue(const char* aTableName);

  Uint64 readAutoIncrementValue(const NdbDictionary::Table * aTable);

  bool setAutoIncrementValue(const char* aTableName, Uint64 val, 

  Uint64 setAutoIncrementValue(const char* aTableName, Uint64 val, 

			      bool increase = false);

  bool setAutoIncrementValue(const NdbDictionary::Table * aTable, Uint64 val, 

  Uint64 setAutoIncrementValue(const NdbDictionary::Table * aTable, Uint64 val, 

			      bool increase = false);

private:

  Uint64 getTupleIdFromNdb(Ndb_local_table_info* info, Uint32 cacheSize);

  Uint64 readTupleIdFromNdb(Ndb_local_table_info* info);

  bool setTupleIdInNdb(Ndb_local_table_info* info, Uint64 val, bool increase);

  Uint64 setTupleIdInNdb(Ndb_local_table_info* info, Uint64 val, bool increase);

  Uint64 opTupleIdOnNdb(Ndb_local_table_info* info, Uint64 opValue, Uint32 op);

public:

storage/ndb/src/ndbapi/Ndb.cpp

+19 −20
Original line number Diff line number Diff line
@@ -768,8 +768,7 @@ Uint64 
Ndb::getAutoIncrementValue(const NdbDictionary::Table * aTable, Uint32 cacheSize)

{

  DBUG_ENTER("getAutoIncrementValue");

  if (aTable == 0)

    DBUG_RETURN(~(Uint64)0);

  assert(aTable != 0);

  const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable);

  const BaseString& internal_tabname = table->m_internalName;
@@ -830,8 +829,7 @@ Uint64 
Ndb::readAutoIncrementValue(const NdbDictionary::Table * aTable)

{

  DBUG_ENTER("readAutoIncrementValue");

  if (aTable == 0)

    DBUG_RETURN(~(Uint64)0);

  assert(aTable != 0);

  const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable);

  const BaseString& internal_tabname = table->m_internalName;
@@ -867,7 +865,7 @@ Ndb::readTupleIdFromNdb(Ndb_local_table_info* info) 
  DBUG_RETURN(tupleId);

}



bool

Uint64

Ndb::setAutoIncrementValue(const char* aTableName, Uint64 val, bool increase)

{

  DBUG_ENTER("setAutoIncrementValue");
@@ -877,17 +875,16 @@ Ndb::setAutoIncrementValue(const char* aTableName, Uint64 val, bool increase) 
    theDictionary->get_local_table_info(internal_tabname);

  if (info == 0) {

    theError.code = theDictionary->getNdbError().code;

    DBUG_RETURN(false);

    DBUG_RETURN(~(Uint64)0);

  }

  DBUG_RETURN(setTupleIdInNdb(info, val, increase));

}



bool

Uint64

Ndb::setAutoIncrementValue(const NdbDictionary::Table * aTable, Uint64 val, bool increase)

{

  DBUG_ENTER("setAutoIncrementValue");

  if (aTable == 0)

    DBUG_RETURN(false);

  assert(aTable != 0);

  const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable);

  const BaseString& internal_tabname = table->m_internalName;
@@ -895,12 +892,12 @@ Ndb::setAutoIncrementValue(const NdbDictionary::Table * aTable, Uint64 val, bool 
    theDictionary->get_local_table_info(internal_tabname, false);

  if (info == 0) {

    theError.code = theDictionary->getNdbError().code;

    DBUG_RETURN(false);

    DBUG_RETURN(~(Uint64)0);

  }

  DBUG_RETURN(setTupleIdInNdb(info, val, increase));

}



bool

Uint64

Ndb::setTupleIdInNdb(Ndb_local_table_info* info, Uint64 val, bool increase)

{

  DBUG_ENTER("setTupleIdInNdb");
@@ -910,11 +907,14 @@ Ndb::setTupleIdInNdb(Ndb_local_table_info* info, Uint64 val, bool increase) 
    {

      assert(info->m_first_tuple_id < info->m_last_tuple_id);

      if (val <= info->m_first_tuple_id + 1)

	DBUG_RETURN(false);

	DBUG_RETURN(val);

      if (val <= info->m_last_tuple_id)

      {

	info->m_first_tuple_id = val - 1;

	DBUG_RETURN(true);

        DBUG_PRINT("info", 

                   ("Setting next auto increment cached value to %llu",

                    (ulonglong)val));  

	DBUG_RETURN(val);

      }

    }

    /*
@@ -962,8 +962,7 @@ Ndb::opTupleIdOnNdb(Ndb_local_table_info* info, Uint64 opValue, Uint32 op) 
  NdbOperation*      tOperation= 0; // Compiler warning if not initialized

  Uint64             tValue;

  NdbRecAttr*        tRecAttrResult;

  int                result;

  Uint64 ret;

  Uint64 ret = ~(Uint64)0;



  CHECK_STATUS_MACRO_ZERO;
@@ -1020,17 +1019,17 @@ Ndb::opTupleIdOnNdb(Ndb_local_table_info* info, Uint64 opValue, Uint32 op) 
      tOperation->def_label(0);

      tOperation->interpret_exit_nok(9999);

      

      if ( (result = tConnection->execute( Commit )) == -1 )

      if (tConnection->execute( Commit ) == -1)

      {

        if (tConnection->theError.code != 9999)

          goto error_handler;



        // NEXTID >= opValue, return ~(Uint64)0 for now since

        // there is no error check...

        ret = ~(Uint64)0;

        ret = opValue;

      }

      else

      {

        DBUG_PRINT("info", 

                   ("Setting next auto increment value (db) to %llu",

                    (ulonglong)opValue));  

        info->m_first_tuple_id = info->m_last_tuple_id = opValue - 1;

	ret = opValue;

      }

storage/ndb/tools/restore/consumer_restore.cpp

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ BackupRestore::finalize_table(const TableS & table){ 
    Uint64 max_val= table.get_max_auto_val();

    Uint64 auto_val= m_ndb->readAutoIncrementValue(get_table(table.m_dictTable));

    if (max_val+1 > auto_val || auto_val == ~(Uint64)0)

      ret= m_ndb->setAutoIncrementValue(get_table(table.m_dictTable), max_val+1, false);

      ret= m_ndb->setAutoIncrementValue(get_table(table.m_dictTable), max_val+1, false) != ~(Uint64)0;

  }

  return ret;

}