diff options
| -rw-r--r-- | innobase/include/trx0trx.h | 4 | ||||
| -rw-r--r-- | innobase/trx/trx0trx.c | 2 | ||||
| -rw-r--r-- | sql/ha_innodb.cc | 9 |
3 files changed, 0 insertions, 15 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 34f820f03e7..be96519c4ea 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -418,10 +418,6 @@ struct trx_struct{ lock_t* auto_inc_lock; /* possible auto-inc lock reserved by the transaction; note that it is also in the lock list trx_locks */ - ibool ignore_duplicates_in_insert; - /* in an insert roll back only insert - of the latest row in case - of a duplicate key error */ UT_LIST_NODE_T(trx_t) trx_list; /* list of transactions */ UT_LIST_NODE_T(trx_t) diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 38d15866769..4ce2236f78a 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -102,8 +102,6 @@ trx_create( trx->mysql_master_log_file_name = (char*) ""; trx->mysql_master_log_pos = 0; - trx->ignore_duplicates_in_insert = FALSE; - mutex_create(&(trx->undo_mutex)); mutex_set_level(&(trx->undo_mutex), SYNC_TRX_UNDO); 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 |