diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-10-31 23:03:27 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-10-31 23:03:27 +0200 |
| commit | c9fa9615a3a3fe88430f5f867655ff84f7dbb7dc (patch) | |
| tree | 319cf19f806cf44cdeb5110b29907a78ab1d83c3 /sql/sql_select.h | |
| parent | ab9fb4ea752731bb04cfbd844902ae34c63123ab (diff) | |
| parent | 8b09f4b074f1b31453fd142b7f3417b33fc0b6f2 (diff) | |
| download | mariadb-git-c9fa9615a3a3fe88430f5f867655ff84f7dbb7dc.tar.gz | |
merge
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 7306f609f66..14450347244 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -131,6 +131,7 @@ class JOIN :public Sql_alloc { public: JOIN_TAB *join_tab,**best_ref,**map2table; + JOIN_TAB *join_tab_save; //saved join_tab for subquery reexecution TABLE **table,**all_tables,*sort_by_table; uint tables,const_tables; uint send_group_parts; @@ -202,7 +203,7 @@ class JOIN :public Sql_alloc void init(THD *thd_arg, List<Item> &fields, ulong select_options_arg, select_result *result_arg) { - join_tab= 0; + join_tab= join_tab_save= 0; table= 0; tables= 0; const_tables= 0; @@ -242,7 +243,7 @@ class JOIN :public Sql_alloc zero_result_cause= 0; optimized= 0; - fields_list = fields; + fields_list= fields; bzero((char*) &keyuse,sizeof(keyuse)); tmp_table_param.copy_field=0; tmp_table_param.end_write_records= HA_POS_ERROR; @@ -280,6 +281,7 @@ class JOIN :public Sql_alloc int rollup_send_data(uint idx); bool test_in_subselect(Item **where); void clear(); + bool save_join_tab(); }; |