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

cleanup: TABLE::update_virtual_fields

Browse Source 
Make update_virtual_fields() a method of TABLE, to be consistent
with TABLE::update_default_fields().
This commit is contained in:
Sergei Golubchik
2016-11-07 21:47:48 +01:00
parent 8b6c0542db
commit 9a3ec79b53
12 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -18444,7 +18444,7 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
join_tab->tracker->r_rows++;
if (join_tab->table->vfield)
update_virtual_fields(join->thd, join_tab->table);
join_tab->table->update_virtual_fields(VCOL_UPDATE_FOR_READ);
if (select_cond)
{
@ -18897,7 +18897,7 @@ join_read_system(JOIN_TAB *tab)
return -1;
}
if (table->vfield)
update_virtual_fields(tab->join->thd, table);
table->update_virtual_fields(VCOL_UPDATE_FOR_READ);
store_record(table,record[1]);
}
else if (!table->status) // Only happens with left join
@ -18944,7 +18944,7 @@ join_read_const(JOIN_TAB *tab)
return -1;
}
if (table->vfield)
update_virtual_fields(tab->join->thd, table);
table->update_virtual_fields(VCOL_UPDATE_FOR_READ);
store_record(table,record[1]);
}
else if (!(table->status & ~STATUS_NULL_ROW)) // Only happens with left join