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

Merge 10.7 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2022-06-28 10:06:00 +03:00
parent b356309840 ac0af4ec4a
commit 9523986299
134 changed files with 6657 additions and 1298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_table.cc
View File

@ -11465,6 +11465,8 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
if (!(*ptr)->vcol_info)
{
bitmap_set_bit(from->read_set, def->field->field_index);
if ((*ptr)->check_assignability_from(def->field))
goto err;
(copy_end++)->set(*ptr,def->field,0);
}
}