1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

5.3->5.5 merge

This commit is contained in:
Sergei Golubchik
2012-11-22 10:19:31 +01:00
61 changed files with 1701 additions and 160 deletions

View File

@@ -7453,7 +7453,7 @@ copy_data_between_tables(THD *thd, TABLE *from,TABLE *to,
}
prev_insert_id= to->file->next_insert_id;
if (to->vfield)
update_virtual_fields(thd, to, TRUE);
update_virtual_fields(thd, to, VCOL_UPDATE_FOR_WRITE);
if (thd->is_error())
{
error= 1;