mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge with 4.0 to get fix for MIN/MAX
BitKeeper/etc/ignore: added support-files/MacOSX/Info.plist Makefile.am: Auto merged include/my_global.h: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/order_by.test: Auto merged mysql-test/t/show_check.test: Auto merged sql/filesort.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/lex.h: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged configure.in: Use local version mysql-test/r/func_group.result: merge mysql-test/r/order_by.result: merge mysql-test/r/show_check.result: merge mysql-test/t/func_group.test: merge mysql-test/t/join.test: merge sql/mysql_priv.h: Use local version sql/sql_yacc.yy: merge sql/table.cc: USe local
This commit is contained in:
@ -103,7 +103,9 @@ public:
|
||||
private:
|
||||
int cmp_prev(QUICK_RANGE *range);
|
||||
bool range_reads_after_key(QUICK_RANGE *range);
|
||||
#ifdef NOT_USED
|
||||
bool test_if_null_range(QUICK_RANGE *range, uint used_key_parts);
|
||||
#endif
|
||||
void reset(void) { next=0; rev_it.rewind(); }
|
||||
List<QUICK_RANGE> rev_ranges;
|
||||
List_iterator<QUICK_RANGE> rev_it;
|
||||
|
Reference in New Issue
Block a user