mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
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:
commit
bb6346fd02
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue