diff options
| author | Kosov Eugene <claprix@yandex.ru> | 2016-09-22 15:03:05 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-05-05 20:36:06 +0300 |
| commit | bd0b21d22cd76a0f52fde3942721cc2331d4be46 (patch) | |
| tree | bfcb11b80bd07a51ed2b3ee39c11e0c0230a47c0 /sql/sql_insert.cc | |
| parent | d8c8d7b9462e3a1c07c97a4cc8e0cb3e5c2ccbae (diff) | |
| download | mariadb-git-bd0b21d22cd76a0f52fde3942721cc2331d4be46.tar.gz | |
SQL: fix for lost code in debug macros
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 4787356c8b6..39a8c61c231 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1029,12 +1029,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, } } - if (table->versioned() && - table->vers_update_fields()) - { - error= 1; - break; - } + if (table->versioned()) + table->vers_update_fields(); if ((res= table_list->view_check_option(thd, (values_list.elements == 1 ? @@ -3799,9 +3795,8 @@ int select_insert::send_data(List<Item> &values) DBUG_RETURN(0); thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields - if (table->versioned() && - table->vers_update_fields()) - DBUG_RETURN(1); + if (table->versioned()) + table->vers_update_fields(); store_values(values); if (table->default_field && table->update_default_fields(0, info.ignore)) DBUG_RETURN(1); |