diff options
| author | unknown <knielsen@loke.(none)> | 2007-10-25 11:00:36 +0200 |
|---|---|---|
| committer | unknown <knielsen@loke.(none)> | 2007-10-25 11:00:36 +0200 |
| commit | 1ebb7098c83a83498dc30689b736e5b9838134c5 (patch) | |
| tree | faaf7d88167ca95f1cf8c1a01f363e267a4208a8 /sql/ha_ndbcluster.cc | |
| parent | 6825b79b41f47e862a17c22d4450b3ce4cdde2af (diff) | |
| parent | e9b98a5de7b49794e3bca82afc6529081e9a2bcf (diff) | |
| download | mariadb-git-1ebb7098c83a83498dc30689b736e5b9838134c5.tar.gz | |
Merge loke.(none):/home/knielsen/devel/mysql-5.0-ndb
into loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
storage/ndb/include/kernel/AttributeHeader.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
sql/ha_ndbcluster.cc:
manual merge.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index b372849a183..a799dd4841b 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -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; |