diff options
| author | unknown <sergefp@mysql.com> | 2003-11-20 23:27:11 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2003-11-20 23:27:11 +0300 |
| commit | bc20df185777934065c1974c90e7f81bc71d89cd (patch) | |
| tree | c6b6240f792d738e5cb60f287415eb3f4c380f08 /sql/opt_range.h | |
| parent | 738728bd1144a29a9b8b380c6a129afc3acdcfc4 (diff) | |
| download | mariadb-git-bc20df185777934065c1974c90e7f81bc71d89cd.tar.gz | |
logging_ok:
Logging to logging@openlogging.org accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
Post-merge fixes
Many files:
new file
sql/opt_ft.h:
Post-merge fixes
sql/opt_range.cc:
Post-merge fixes
sql/opt_range.h:
Post-merge fixes
sql/sql_select.cc:
Post-merge fixes
sql/sql_union.cc:
Post-merge fixes
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/opt_range.h')
| -rw-r--r-- | sql/opt_range.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index e4fcbf657b7..48549f8ab91 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -119,7 +119,7 @@ public: protected: friend void print_quick_sel_range(QUICK_RANGE_SELECT *quick, key_map needed_reg); - friend QUICK_RANGE_SELECT *get_quick_select_for_ref(TABLE *table, + friend QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, struct st_table_ref *ref); friend bool get_quick_keys(struct st_qsel_param *param, QUICK_RANGE_SELECT *quick,KEY_PART *key, @@ -134,11 +134,10 @@ protected: List_iterator<QUICK_RANGE> it; QUICK_RANGE *range; MEM_ROOT alloc; - KEY_PART *key_parts; - QUICK_SELECT(THD *thd, TABLE *table,uint index_arg,bool no_alloc=0); //!!todo: add thd to my ctor below + KEY_PART *key_parts; int cmp_next(QUICK_RANGE *range); public: - QUICK_RANGE_SELECT(TABLE *table,uint index_arg,bool no_alloc=0, + QUICK_RANGE_SELECT(THD *thd, TABLE *table,uint index_arg,bool no_alloc=0, MEM_ROOT *parent_alloc=NULL); ~QUICK_RANGE_SELECT(); |