diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-04-27 22:12:38 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-04-27 22:12:38 +0300 |
| commit | 31dc4b3c83917c48ee4882add75143a273a0c98b (patch) | |
| tree | d20bc52279cfac450dfae56b639e978e6c51e3c4 /sql | |
| parent | f22be777341f53b4deb58851828c0733ab5380bf (diff) | |
| parent | 0f78cb180743b150e0afe673e9bdc709adb72da3 (diff) | |
| download | mariadb-git-31dc4b3c83917c48ee4882add75143a273a0c98b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index e0a3a69c819..73654536083 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -1911,13 +1911,6 @@ ha_innobase::write_row( build_template(prebuilt, NULL, table, ROW_MYSQL_WHOLE_ROW); } - if (user_thd->lex.sql_command == SQLCOM_INSERT - && user_thd->lex.duplicates == DUP_IGNORE) { - prebuilt->trx->ignore_duplicates_in_insert = TRUE; - } else { - prebuilt->trx->ignore_duplicates_in_insert = FALSE; - } - srv_conc_enter_innodb(prebuilt->trx); error = row_insert_for_mysql((byte*) record, prebuilt); @@ -1958,8 +1951,6 @@ ha_innobase::write_row( } } - prebuilt->trx->ignore_duplicates_in_insert = FALSE; - error = convert_error_code_to_mysql(error, user_thd); /* Tell InnoDB server that there might be work for |