diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-11-02 13:35:14 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-11-02 13:35:14 +0200 |
| commit | 502300b800d6a3e52d2209f97c27733917a25888 (patch) | |
| tree | 7736faf821b97ec0e0a0a648dc7b09b3a34b7f08 | |
| parent | 0d92f0c777e170b4de4eff45e3f1ed08f3ccc836 (diff) | |
| parent | b3042ccbb44fe399a64cbbcbc5dc7f4ac0ef784b (diff) | |
| download | mariadb-git-502300b800d6a3e52d2209f97c27733917a25888.tar.gz | |
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
| -rw-r--r-- | sql/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 8d9ecb95fc0..0bcb7062437 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2464,7 +2464,7 @@ ha_innobase::write_row( NOTE that a REPLACE command and LOAD DATA INFILE REPLACE handles a duplicate key error itself, and we must not decrement the autoinc counter - if we are performing a those statements. + if we are performing those statements. NOTE 2: if there was an error, for example a deadlock, which caused InnoDB to roll back the whole transaction already in the call of row_insert_for_mysql(), we may no |