Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0

into hundin.mysql.fi:/home/marko/k/mysql-4.0

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
e5493270 · unknown · b99e57bb · b7cd3f5e · e5493270
Commit e5493270 authored Nov 03, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/ha_innodb.cc sql/ha_innodb.cc +3 -1

No files found.
--- 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;
 		}