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

Merge 5.0 -> 5.1

Browse Source 
Fixes +
Adapted to new name resolution context after WL #2486
This commit is contained in:
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
2005-08-26 20:56:19 -04:00
parent 9650caaf61
commit d6f11ee980
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@ -3609,7 +3609,7 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
TABLE *table_2= nj_col_2->table_ref->table;
/* Mark field_2 used for table cache. */
field_2->query_id= thd->query_id;
table_2->file->ha_set_bit_in_read_set(field_1->fieldnr);
table_2->file->ha_set_bit_in_read_set(field_2->fieldnr);
table_2->used_keys.intersect(field_2->part_of_key);
}
@ -4472,7 +4472,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
if (field->query_id == thd->query_id)
thd->dupp_field= field;
field->query_id= thd->query_id;
table->file->ha_set_bit_in_read_set(field->fieldnr);
field->table->file->ha_set_bit_in_read_set(field->fieldnr);
if (table)
table->used_keys.intersect(field->part_of_key);