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

into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
This commit is contained in:
knielsen@loke.(none) 2007-10-25 11:00:36 +02:00
commit bb6346fd02

View file

@ -2795,7 +2795,7 @@ int ha_ndbcluster::write_row(uchar *record)
if (ndb->getAutoIncrementValue(m_table, g.range, auto_value, 1) == -1) if (ndb->getAutoIncrementValue(m_table, g.range, auto_value, 1) == -1)
{ {
if (--retries && if (--retries &&
ndb->getNdbError().status == NdbError::TemporaryError); ndb->getNdbError().status == NdbError::TemporaryError)
{ {
my_sleep(retry_sleep); my_sleep(retry_sleep);
continue; 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)) ndb->getAutoIncrementValue(m_table, g.range, auto_value, cache_size, increment, offset))
{ {
if (--retries && if (--retries &&
ndb->getNdbError().status == NdbError::TemporaryError); ndb->getNdbError().status == NdbError::TemporaryError)
{ {
my_sleep(retry_sleep); my_sleep(retry_sleep);
continue; continue;