diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-07-03 14:02:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-07-03 14:02:05 +0400 |
| commit | e61568ee9305c6c93c1a9f298a7fe04532881f24 (patch) | |
| tree | c80b0967460f7c4f8743831690f7369e11c73722 /sql/sql_load.cc | |
| parent | 4b0cedf82d8d8ba582648dcb4a2620c146862a43 (diff) | |
| parent | c3289d27eef39a47fed2ce1ff239013ed6870f39 (diff) | |
| download | mariadb-git-e61568ee9305c6c93c1a9f298a7fe04532881f24.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index cc5a5c7c794..ddb5029c78a 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -431,13 +431,6 @@ int mysql_load(THD *thd, const sql_exchange *ex, TABLE_LIST *table_list, is_concurrent= (table_list->lock_type == TL_WRITE_CONCURRENT_INSERT); #endif - if (table->versioned(VERS_TIMESTAMP) && handle_duplicates == DUP_REPLACE) - { - // Additional memory may be required to create historical items. - if (table_list->set_insert_values(thd->mem_root)) - DBUG_RETURN(TRUE); - } - if (!fields_vars.elements) { Field_iterator_table_ref field_iterator; |