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 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.

Browse Source
This commit is contained in:
Igor Babaev
2012-02-01 15:48:02 -08:00
parent 7ed15e6e50 81690cf326
commit 7b79d8a33f
57 changed files with 1456 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/table.cc
View File

@ -4481,6 +4481,7 @@ Item *Field_iterator_table::create_item(THD *thd)
{
select->non_agg_fields.push_back(item);
item->marker= select->cur_pos_in_select_list;
select->set_non_agg_field_used(true);
}
return item;
}
@ -5184,6 +5185,9 @@ void st_table::mark_virtual_columns_for_write(bool insert_fl)
Field **vfield_ptr, *tmp_vfield;
bool bitmap_updated= FALSE;
if (!vfield)
return;
for (vfield_ptr= vfield; *vfield_ptr; vfield_ptr++)
{
tmp_vfield= *vfield_ptr;