diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-17 08:42:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-17 08:42:53 +0300 |
| commit | 4c7608aeb187383f2629e96e085b5b50fc81337f (patch) | |
| tree | fc8dce68b02a63ca204203034dae81a7162a4b9f /sql/sql_delete.cc | |
| parent | c2352c45fbd670f50b73415eeeb676aa67fb4a29 (diff) | |
| parent | a4e7800701d0764fe4cbb85b81d7c7cb54677334 (diff) | |
| download | mariadb-git-4c7608aeb187383f2629e96e085b5b50fc81337f.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index d4a2f779544..2781bd50d26 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -324,13 +324,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, DBUG_ASSERT(!conds); conds= table_list->on_expr; table_list->on_expr= NULL; - - // trx_sees() in InnoDB reads row_start - if (!table->versioned(VERS_TIMESTAMP)) - { - DBUG_ASSERT(table_list->vers_conditions.type == SYSTEM_TIME_BEFORE); - bitmap_set_bit(table->read_set, table->vers_end_field()->field_index); - } } if (mysql_handle_list_of_derived(thd->lex, table_list, DT_MERGE_FOR_INSERT)) @@ -951,7 +944,8 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, if (select_lex->vers_setup_conds(thd, table_list)) DBUG_RETURN(true); } - if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num)) || + if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num, + &select_lex->hidden_bit_fields)) || setup_fields(thd, Ref_ptr_array(), field_list, MARK_COLUMNS_READ, NULL, NULL, 0) || setup_conds(thd, table_list, select_lex->leaf_tables, conds) || |