diff options
| author | unknown <svoj@april.(none)> | 2006-09-18 16:23:45 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-09-18 16:23:45 +0500 |
| commit | dfb219f6c91e19293c23e64f1bc98d0bb9696fee (patch) | |
| tree | 6d1754293628ba876befcd642131930d508976fa /sql/ha_ndbcluster.cc | |
| parent | 24cdd48020634acc1c2c2309a5c27d28368e0ba9 (diff) | |
| parent | 0509d3ebd32d736d3c908dee8f92d2b9f16a4da6 (diff) | |
| download | mariadb-git-dfb219f6c91e19293c23e64f1bc98d0bb9696fee.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/errmsg.txt:
SCCS merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 9c4a2c20ca0..5448b08b74f 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -2131,9 +2131,11 @@ int ha_ndbcluster::write_row(byte *record) if (has_auto_increment) { THD *thd= table->in_use; + int error; m_skip_auto_increment= FALSE; - update_auto_increment(); + if ((error= update_auto_increment())) + DBUG_RETURN(error); /* Ensure that handler is always called for auto_increment values */ thd->next_insert_id= 0; m_skip_auto_increment= !auto_increment_column_changed; |