database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
Igor Babaev
2011-03-13 03:50:14 -07:00
parent 26d6806f98 3d3d5f1d43
commit edc69e3227
7 changed files with 158 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.h
View File

@@ -798,6 +798,7 @@ public:
ORDER *order, *group_list, *proc_param; //hold parameters of mysql_select
COND *conds; // ---"---
Item *conds_history; // store WHERE for explain
COND *outer_ref_cond; ///<part of conds containing only outer references
TABLE_LIST *tables_list; ///<hold 'tables' parameter of mysql_select
List<TABLE_LIST> *join_list; ///< list of joined tables in reverse order
COND_EQUAL *cond_equal;
@@ -903,6 +904,7 @@ public:
no_const_tables= FALSE;
first_select= sub_select;
outer_ref_cond= 0;
}
int prepare(Item ***rref_pointer_array, TABLE_LIST *tables, uint wind_num,