diff options
| author | unknown <kostja@bodhi.local> | 2006-10-23 11:51:45 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-10-23 11:51:45 +0400 |
| commit | 07cf5b9bd349f799bc0e81caf79edfbd29fd0512 (patch) | |
| tree | 8975cf9bcdde83b55d94ab5299cb5d61a93acb9c /sql/opt_range.h | |
| parent | 8db4dc3f91dfbe03181e63ed45bdf35a5d65aeb0 (diff) | |
| parent | 133e91aa89e05437158946c0a3b7f7d2f27a0f6d (diff) | |
| download | mariadb-git-07cf5b9bd349f799bc0e81caf79edfbd29fd0512.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
Manual merge.
Diffstat (limited to 'sql/opt_range.h')
| -rw-r--r-- | sql/opt_range.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index 40a95beb894..ddc959f1cdf 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -295,6 +295,7 @@ protected: friend class QUICK_SELECT_DESC; friend class QUICK_INDEX_MERGE_SELECT; friend class QUICK_ROR_INTERSECT_SELECT; + friend class QUICK_GROUP_MIN_MAX_SELECT; DYNAMIC_ARRAY ranges; /* ordered array of range ptrs */ QUICK_RANGE **cur_range; /* current element in ranges */ @@ -643,6 +644,7 @@ public: ~QUICK_GROUP_MIN_MAX_SELECT(); bool add_range(SEL_ARG *sel_range); void update_key_stat(); + void adjust_prefix_ranges(); bool alloc_buffers(); int init(); int reset(); |