summaryrefslogtreecommitdiff
path: root/sql/opt_range.h
diff options
context:
space:
mode:
authorgkodinov/kgeorge@macbook.gmz <>2006-08-03 19:20:30 +0300
committergkodinov/kgeorge@macbook.gmz <>2006-08-03 19:20:30 +0300
commit3183f73601e70a4d07f34780bf933a46e08da05a (patch)
tree4ccbef8986f35888340564df13147cdf4e7441e4 /sql/opt_range.h
parent40a1fbdffb778825d8330bed83b28d8209e27b27 (diff)
downloadmariadb-git-3183f73601e70a4d07f34780bf933a46e08da05a.tar.gz
Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
Reseting subqueries with "quick" access methods was incomplete. Partially backported the correct reseting of QUICK_SELECTs from 5.x.
Diffstat (limited to 'sql/opt_range.h')
-rw-r--r--sql/opt_range.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 15f0bf02b34..367a85dc6f2 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -86,7 +86,7 @@ public:
QUICK_SELECT(THD *thd, TABLE *table,uint index_arg,bool no_alloc=0);
virtual ~QUICK_SELECT();
- void reset(void) { next=0; it.rewind(); }
+ virtual void reset(void);
int init()
{
key_part_info= head->key_info[index].key_part;
@@ -120,7 +120,7 @@ private:
#ifdef NOT_USED
bool test_if_null_range(QUICK_RANGE *range, uint used_key_parts);
#endif
- void reset(void) { next=0; rev_it.rewind(); }
+ void reset(void);
List<QUICK_RANGE> rev_ranges;
List_iterator<QUICK_RANGE> rev_it;
};