diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-08-02 11:54:35 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-08-02 11:54:35 +0400 |
| commit | 53fb954ddefdddc5484626fc9392e2f3d557eabc (patch) | |
| tree | 6d923a32bd3804ae141bd4559c52d2b112b9dd34 /sql/sql_select.cc | |
| parent | 8625a873d2ee555cd8abe8903183b51f3a355c40 (diff) | |
| parent | 3468b55a215d1c4b489dbb925f19176e12c9f242 (diff) | |
| download | mariadb-git-53fb954ddefdddc5484626fc9392e2f3d557eabc.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index cb811a57cf7..35495197c2b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -435,7 +435,7 @@ fix_inner_refs(THD *thd, List<Item> &all_fields, SELECT_LEX *select, if (!ref->fixed && ref->fix_fields(thd, 0)) return TRUE; - thd->used_tables|= item->used_tables(); + thd->lex->used_tables|= item->used_tables(); } return false; } @@ -1675,7 +1675,7 @@ JOIN::optimize() if (exec_tmp_table1->distinct) { - table_map used_tables= thd->used_tables; + table_map used_tables= thd->lex->used_tables; JOIN_TAB *last_join_tab= join_tab+tables-1; do { @@ -2552,7 +2552,7 @@ mysql_select(THD *thd, Item ***rref_pointer_array, if (!(join= new JOIN(thd, fields, select_options, result))) DBUG_RETURN(TRUE); thd_proc_info(thd, "init"); - thd->used_tables=0; // Updated by setup_fields + thd->lex->used_tables=0; // Updated by setup_fields err= join->prepare(rref_pointer_array, tables, wild_num, conds, og_num, order, group, having, proc_param, select_lex, unit); @@ -17032,7 +17032,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order, need_order=0; extra.append(STRING_WITH_LEN("; Using filesort")); } - if (distinct & test_all_bits(used_tables,thd->used_tables)) + if (distinct & test_all_bits(used_tables, thd->lex->used_tables)) extra.append(STRING_WITH_LEN("; Distinct")); for (uint part= 0; part < tab->ref.key_parts; part++) |