mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
This commit is contained in:
marko@hundin.mysql.fi 2004-11-03 11:09:41 +02:00
commit 73bb6b9c33
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/ha_innodb.cc
View file

@ -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;
}