Commit bb6346fd authored by knielsen@loke.(none)'s avatar knielsen@loke.(none)
Browse files

Merge loke.(none):/home/knielsen/devel/mysql-5.0-ndb 

into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
parents 328fc573 b77f44c7

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -2795,7 +2795,7 @@ int ha_ndbcluster::write_row(uchar *record) 
      if (ndb->getAutoIncrementValue(m_table, g.range, auto_value, 1) == -1)

      {

	if (--retries &&

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

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

	{

	  my_sleep(retry_sleep);

	  continue;
@@ -6189,7 +6189,7 @@ void ha_ndbcluster::get_auto_increment(ulonglong offset, ulonglong increment, 
        ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size, increment, offset))

    {

      if (--retries &&

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

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

      {

        my_sleep(retry_sleep);

        continue;