diff options
| author | heikki@hundin.mysql.fi <> | 2003-04-27 17:25:39 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2003-04-27 17:25:39 +0300 |
| commit | a1861ddb2215aad22f24b83dc2f7e48a25068051 (patch) | |
| tree | 696b0fa562cf14871ea3289245bbc6a212eb3822 /sql/ha_innodb.cc | |
| parent | 5e8f76c433f90b0c72b48f0ed587f7c9dd7113a4 (diff) | |
| download | mariadb-git-a1861ddb2215aad22f24b83dc2f7e48a25068051.tar.gz | |
trx0trx.h, trx0trx.c, ha_innodb.cc:
Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error
Diffstat (limited to 'sql/ha_innodb.cc')
| -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 1363227605e..1ea8b91a978 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 |