diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-11-03 11:09:41 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-11-03 11:09:41 +0200 |
| commit | 1d6350900536aa8f9eacf2ed3c70c42b3c49a726 (patch) | |
| tree | eda641c79bafd6599b660e79b82834bf74e95580 | |
| parent | 3ff74fe4a07b407166fb1b35ba48db0949e7d175 (diff) | |
| parent | 9c06c80dff5744ac0b1d214404c9d16f752e41bb (diff) | |
| download | mariadb-git-1d6350900536aa8f9eacf2ed3c70c42b3c49a726.tar.gz | |
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index e747ff3210c..d57a9f73c91 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2285,7 +2285,9 @@ ha_innobase::write_row( if (error == DB_DUPLICATE_KEY && (user_thd->lex.sql_command == SQLCOM_REPLACE || user_thd->lex.sql_command - == SQLCOM_REPLACE_SELECT)) { + == SQLCOM_REPLACE_SELECT + || (user_thd->lex.sql_command == SQLCOM_LOAD + && user_thd->lex.duplicates == DUP_REPLACE))) { skip_auto_inc_decr= TRUE; } |