Commit a858ff17 authored by Sergei Golubchik's avatar Sergei Golubchik

different fix for MDEV-26778

parent d94ed0bb
...@@ -4193,7 +4193,6 @@ int select_insert::send_data(List<Item> &values) ...@@ -4193,7 +4193,6 @@ int select_insert::send_data(List<Item> &values)
bool error=0; bool error=0;
thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields
table->reset_default_fields();
store_values(values); store_values(values);
if (table->default_field && if (table->default_field &&
unlikely(table->update_default_fields(info.ignore))) unlikely(table->update_default_fields(info.ignore)))
......
...@@ -1106,7 +1106,6 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, ...@@ -1106,7 +1106,6 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
} }
} }
restore_record(table, s->default_values); restore_record(table, s->default_values);
table->reset_default_fields();
while ((item= it++)) while ((item= it++))
{ {
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
compare_record(TABLE*). compare_record(TABLE*).
*/ */
bool records_are_comparable(const TABLE *table) { bool records_are_comparable(const TABLE *table) {
return !table->versioned(VERS_TRX_ID) && return !table->versioned() &&
(((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) == 0) || (((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) == 0) ||
bitmap_is_subset(table->write_set, table->read_set)); bitmap_is_subset(table->write_set, table->read_set));
} }
......
...@@ -9164,13 +9164,11 @@ bool TABLE::vers_update_fields() ...@@ -9164,13 +9164,11 @@ bool TABLE::vers_update_fields()
{ {
DBUG_ASSERT(0); DBUG_ASSERT(0);
} }
vers_start_field()->set_has_explicit_value();
} }
if (!versioned(VERS_TIMESTAMP) || !vers_end_field()->has_explicit_value()) if (!versioned(VERS_TIMESTAMP) || !vers_end_field()->has_explicit_value())
{ {
vers_end_field()->set_max(); vers_end_field()->set_max();
vers_end_field()->set_has_explicit_value();
res= true; res= true;
} }
...@@ -9185,7 +9183,6 @@ void TABLE::vers_update_end() ...@@ -9185,7 +9183,6 @@ void TABLE::vers_update_end()
if (vers_end_field()->store_timestamp(in_use->query_start(), if (vers_end_field()->store_timestamp(in_use->query_start(),
in_use->query_start_sec_part())) in_use->query_start_sec_part()))
DBUG_ASSERT(0); DBUG_ASSERT(0);
vers_end_field()->set_has_explicit_value();
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment