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

Merge mariadb 5.3->mariadb 5.5

Browse Source
This commit is contained in:
unknown
2012-03-24 18:21:22 +01:00
parent b34cfe9327 f72e0e686b
commit 335de5db18
42 changed files with 893 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_table.cc
View File

@@ -7274,7 +7274,8 @@ copy_data_between_tables(THD *thd, TABLE *from,TABLE *to,
error= 1;
break;
}
update_virtual_fields(thd, from);
if (from->vfield)
update_virtual_fields(thd, from);
if (++thd->progress.counter >= time_to_report_progress)
{
time_to_report_progress+= MY_HOW_OFTEN_TO_WRITE/10;
@@ -7301,7 +7302,8 @@ copy_data_between_tables(THD *thd, TABLE *from,TABLE *to,
copy_ptr->do_copy(copy_ptr);
}
prev_insert_id= to->file->next_insert_id;
update_virtual_fields(thd, to, TRUE);
if (to->vfield)
update_virtual_fields(thd, to, TRUE);
if (thd->is_error())
{
error= 1;