Skip to content

Commit a858ff1

Browse files
committed
different fix for MDEV-26778
1 parent d94ed0b commit a858ff1

File tree

4 files changed

+1
-6
lines changed

4 files changed

+1
-6
lines changed

sql/sql_insert.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4193,7 +4193,6 @@ int select_insert::send_data(List<Item> &values)
41934193
bool error=0;
41944194

41954195
thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields
4196-
table->reset_default_fields();
41974196
store_values(values);
41984197
if (table->default_field &&
41994198
unlikely(table->update_default_fields(info.ignore)))

sql/sql_load.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,6 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
11061106
}
11071107
}
11081108
restore_record(table, s->default_values);
1109-
table->reset_default_fields();
11101109

11111110
while ((item= it++))
11121111
{

sql/sql_update.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
compare_record(TABLE*).
5252
*/
5353
bool records_are_comparable(const TABLE *table) {
54-
return !table->versioned(VERS_TRX_ID) &&
54+
return !table->versioned() &&
5555
(((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) == 0) ||
5656
bitmap_is_subset(table->write_set, table->read_set));
5757
}

sql/table.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9164,13 +9164,11 @@ bool TABLE::vers_update_fields()
91649164
{
91659165
DBUG_ASSERT(0);
91669166
}
9167-
vers_start_field()->set_has_explicit_value();
91689167
}
91699168

91709169
if (!versioned(VERS_TIMESTAMP) || !vers_end_field()->has_explicit_value())
91719170
{
91729171
vers_end_field()->set_max();
9173-
vers_end_field()->set_has_explicit_value();
91749172
res= true;
91759173
}
91769174

@@ -9185,7 +9183,6 @@ void TABLE::vers_update_end()
91859183
if (vers_end_field()->store_timestamp(in_use->query_start(),
91869184
in_use->query_start_sec_part()))
91879185
DBUG_ASSERT(0);
9188-
vers_end_field()->set_has_explicit_value();
91899186
}
91909187

91919188
/**

0 commit comments

Comments
 (0)