database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge fixes

Browse Source
This commit is contained in:
unknown
2005-08-25 15:02:40 -04:00
parent da862ab927
commit 9b352548fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@@ -3598,7 +3598,7 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
if (field_1) if (field_1)
{ {
TABLE *table_1= nj_col1->table_ref->table; TABLE *table_1= nj_col_1->table_ref->table;
/* Mark field_1 used for table cache. */ /* Mark field_1 used for table cache. */
field_1->query_id= thd->query_id; field_1->query_id= thd->query_id;
table_1->file->ha_set_bit_in_read_set(field_1->fieldnr); table_1->file->ha_set_bit_in_read_set(field_1->fieldnr);
@@ -3606,7 +3606,7 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
} }
if (field_2) if (field_2)
{ {
TABLE *table_2= nj_col2->table_ref->table; TABLE *table_2= nj_col_2->table_ref->table;
/* Mark field_2 used for table cache. */ /* Mark field_2 used for table cache. */
field_2->query_id= thd->query_id; 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_1->fieldnr);