database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

different fix for MDEV-26778

Browse Source
This commit is contained in:
Sergei Golubchik
2022-10-10 17:35:23 +02:00
parent d94ed0bb2a
commit a858ff1731
4 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_insert.cc
View File

@ -4193,7 +4193,6 @@ int select_insert::send_data(List<Item> &values)
bool error=0;
thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields
table->reset_default_fields();
store_values(values);
if (table->default_field &&
unlikely(table->update_default_fields(info.ignore)))

1
sql/sql_load.cc
View File

@ -1106,7 +1106,6 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
}
}
restore_record(table, s->default_values);
table->reset_default_fields();
while ((item= it++))
{

2
sql/sql_update.cc
View File

@ -51,7 +51,7 @@
compare_record(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) ||
bitmap_is_subset(table->write_set, table->read_set));
}

3
sql/table.cc
View File

@ -9164,13 +9164,11 @@ bool TABLE::vers_update_fields()
{
DBUG_ASSERT(0);
}
vers_start_field()->set_has_explicit_value();
}
if (!versioned(VERS_TIMESTAMP) || !vers_end_field()->has_explicit_value())
{
vers_end_field()->set_max();
vers_end_field()->set_has_explicit_value();
res= true;
}
@ -9185,7 +9183,6 @@ void TABLE::vers_update_end()
if (vers_end_field()->store_timestamp(in_use->query_start(),
in_use->query_start_sec_part()))
DBUG_ASSERT(0);
vers_end_field()->set_has_explicit_value();
}
/**