Commit 1d635090 authored by unknown's avatar unknown
Browse files

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

into hundin.mysql.fi:/home/marko/k/mysql-4.0
parents 3ff74fe4 9c06c80d

sql/ha_innodb.cc

+3 −1
Original line number Diff line number Diff line
@@ -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;

		}