From d8010263a5abc731affd3482f117ef219af75d06 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 24 Nov 2003 20:54:57 +0300 Subject: Post-merge fixes for index_merge/Unique/5.0 mysql-test/r/index_merge.result: Post-merge fixes mysql-test/r/index_merge_innodb.result: Post-merge fixes sql/opt_range.cc: Post-merge fixes sql/opt_range.h: Post-merge fixes --- sql/opt_range.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/opt_range.h') diff --git a/sql/opt_range.h b/sql/opt_range.h index e312dd39bad..9e392104818 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -88,7 +88,7 @@ public: QUICK_SELECT_I(); virtual ~QUICK_SELECT_I(){}; virtual int init() = 0; - virtual void reset(void) = 0; + virtual int reset(void) = 0; virtual int get_next() = 0; /* get next record to retrieve */ virtual bool reverse_sorted() = 0; virtual bool unique_key_range() { return false; } @@ -140,7 +140,7 @@ public: MEM_ROOT *parent_alloc=NULL); ~QUICK_RANGE_SELECT(); - void reset(void) { next=0; it.rewind(); } + int reset(void) { next=0; it.rewind(); return 0; } int init(); int get_next(); bool reverse_sorted() { return 0; } -- cgit v1.2.1