diff options
| author | unknown <mskold/marty@quadfish.(none)> | 2008-01-25 14:34:15 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@quadfish.(none)> | 2008-01-25 14:34:15 +0100 |
| commit | ccb999656f59d41570cfddfaaebbec39f1445cc5 (patch) | |
| tree | 11dc791d3ba9a318b1981827f72861cf5647bed7 /sql/ha_ndbcluster.cc | |
| parent | 1c28ac77e8ac74a486b111da33c7c1c69e18c2f1 (diff) | |
| parent | 77b2e8f314f1df93df6661b2bd89ab806c41d359 (diff) | |
| download | mariadb-git-ccb999656f59d41570cfddfaaebbec39f1445cc5.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index f72aa7cffea..b4bf8e15902 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -2738,10 +2738,13 @@ ha_ndbcluster::set_auto_inc(Field *field) ("Trying to set next auto increment value to %s", llstr(next_val, buff))); #endif - Ndb_tuple_id_range_guard g(m_share); - if (ndb->setAutoIncrementValue(m_table, g.range, next_val, TRUE) - == -1) - ERR_RETURN(ndb->getNdbError()); + if (ndb->checkUpdateAutoIncrementValue(m_share->tuple_id_range, next_val)) + { + Ndb_tuple_id_range_guard g(m_share); + if (ndb->setAutoIncrementValue(m_table, g.range, next_val, TRUE) + == -1) + ERR_RETURN(ndb->getNdbError()); + } DBUG_RETURN(0); } |