diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-23 09:48:43 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-23 09:48:43 -0400 |
| commit | 7732a5901f8faede18132be2417579a7072ec735 (patch) | |
| tree | 925838ffbe750c1c8dbeb33a36a1640027b07a4d /sql/ha_innodb.cc | |
| parent | d3269f883055564d21dc13640eca7a164d231b15 (diff) | |
| parent | f3172a8957e5c2edde1a5dedb94cd293609933df (diff) | |
| download | mariadb-git-7732a5901f8faede18132be2417579a7072ec735.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index ddf2fbf26aa..e99d93784c9 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -3252,7 +3252,8 @@ no_commit: /* We must use the handler code to update the auto-increment value to be sure that we increment it correctly. */ - update_auto_increment(); + if ((error= update_auto_increment())) + goto func_exit; auto_inc_used = 1; } |