mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 16:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source
This commit is contained in:
Igor Babaev 2010-07-17 12:58:08 -07:00
commit 4f564a5443
17 changed files with 140 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_update.cc
View file

@ -472,7 +472,7 @@ int mysql_update(THD *thd,
while (!(error=info.read_record(&info)) &&
!thd->killed && !thd->is_error())
{
update_virtual_fields(table);
update_virtual_fields(thd, table);
if (!select || select->skip_record(thd) > 0)
{
if (table->file->was_semi_consistent_read())
@ -580,7 +580,7 @@ int mysql_update(THD *thd,
while (!(error=info.read_record(&info)) && !thd->killed)
{
update_virtual_fields(table);
update_virtual_fields(thd, table);
if (!select || select->skip_record(thd) > 0)
{
if (table->file->was_semi_consistent_read())