diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 11:12:35 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 11:12:35 +0200 |
| commit | 73baa90a07fd7f5cc68ee72c36a16f906b690aac (patch) | |
| tree | 9be74a8f0ac2aa9f6b4197d560171877636e55bf /sql/opt_range.h | |
| parent | 94f337bb4d5593221ae257fcf18a439c87eb0fe9 (diff) | |
| parent | 951243708c3e6ccd18153abdc082583664c007e7 (diff) | |
| download | mariadb-git-73baa90a07fd7f5cc68ee72c36a16f906b690aac.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
mysql-test/r/myisam.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 6099608f7cd..a88c79e8bab 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(); |