Commit 6b75a704 authored by unknown's avatar unknown
Browse files

Bug #9839 Column with AUTOINC contains -1 Value on node stop, post review fix

parent b112ccb5

sql/ha_ndbcluster.cc

+18 −5
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static const char *ha_ndb_ext=".ndb"; 
#define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8



#define NDB_FAILED_AUTO_INCREMENT ~(Uint64)0

#define NDB_AUTO_INCREMENT_RETRIES 10



#define ERR_PRINT(err) \

  DBUG_PRINT("error", ("%d  message: %s", err.code, err.message))
@@ -1839,7 +1840,13 @@ int ha_ndbcluster::write_row(byte *record) 
  {

    // Table has hidden primary key

    Ndb *ndb= get_ndb();

    Uint64 auto_value= ndb->getAutoIncrementValue((const NDBTAB *) m_table);

    Uint64 auto_value= NDB_FAILED_AUTO_INCREMENT;

    uint retries= NDB_AUTO_INCREMENT_RETRIES;

    do {

      auto_value= ndb->getAutoIncrementValue((const NDBTAB *) m_table);

    } while (auto_value == NDB_FAILED_AUTO_INCREMENT && 

             --retries &&

             ndb->getNdbError().status == NdbError::TemporaryError);

    if (auto_value == NDB_FAILED_AUTO_INCREMENT)

      ERR_RETURN(ndb->getNdbError());

    if (set_hidden_key(op, table->fields, (const byte*)&auto_value))
@@ -3974,10 +3981,16 @@ longlong ha_ndbcluster::get_auto_increment() 
    : (m_rows_to_insert > m_autoincrement_prefetch) ? 

    m_rows_to_insert 

    : m_autoincrement_prefetch;

  Uint64 auto_value= 

  Uint64 auto_value= NDB_FAILED_AUTO_INCREMENT;

  uint retries= NDB_AUTO_INCREMENT_RETRIES;

  do {

    auto_value=

      (m_skip_auto_increment) ? 

      ndb->readAutoIncrementValue((const NDBTAB *) m_table)

      : ndb->getAutoIncrementValue((const NDBTAB *) m_table, cache_size);

  } while (auto_value == NDB_FAILED_AUTO_INCREMENT && 

           --retries &&

           ndb->getNdbError().status == NdbError::TemporaryError);

  if (auto_value == NDB_FAILED_AUTO_INCREMENT)

    ERR_RETURN(ndb->getNdbError());

  DBUG_RETURN((longlong)auto_value);