Commit e9b98a5d authored by unknown's avatar unknown

Merge loke.(none):/home/knielsen/devel/bug31810

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


sql/ha_ndbcluster.cc:
  Auto merged
parents fd1730f4 34279339
...@@ -2333,7 +2333,7 @@ int ha_ndbcluster::write_row(byte *record) ...@@ -2333,7 +2333,7 @@ int ha_ndbcluster::write_row(byte *record)
auto_value, 1) == -1) 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;
...@@ -4894,7 +4894,7 @@ ulonglong ha_ndbcluster::get_auto_increment() ...@@ -4894,7 +4894,7 @@ ulonglong ha_ndbcluster::get_auto_increment()
auto_value, cache_size, step, start)) auto_value, cache_size, step, start))
{ {
if (--retries && if (--retries &&
ndb->getNdbError().status == NdbError::TemporaryError); ndb->getNdbError().status == NdbError::TemporaryError)
{ {
my_sleep(retry_sleep); my_sleep(retry_sleep);
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment