diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-11-02 13:21:11 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-11-02 13:21:11 +0200 |
| commit | 9c06c80dff5744ac0b1d214404c9d16f752e41bb (patch) | |
| tree | 3a7d4374442275e723f1ee2463eaa0b7377a8e09 /sql/ha_innodb.cc | |
| parent | 61ac832464a48afcf85f8c302734aa01d4346c78 (diff) | |
| download | mariadb-git-9c06c80dff5744ac0b1d214404c9d16f752e41bb.tar.gz | |
ha_innodb.cc:
Backport Jan's fix of the LOAD DATA INFILE REPLACE duplicate key error bug (Bug #5835) to 4.0
sql/ha_innodb.cc:
Backport Jan's fix of the LOAD DATA INFILE REPLACE duplicate key error bug (Bug #5835) to 4.0
Diffstat (limited to 'sql/ha_innodb.cc')
| -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; } |