diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-04-15 09:16:54 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-04-15 09:16:54 -0700 |
| commit | f4cd2b37b12617ca383e625dfd07ce1468c5b5a8 (patch) | |
| tree | 4720b59562af2f8a4208b3cce4dca649d05b029b /sql/opt_range.h | |
| parent | ab10dc8fafc3ff5448947e698b500bab4042e95e (diff) | |
| parent | 30b2c64c4e87f8924fe817f5c607ae90a990e9e5 (diff) | |
| download | mariadb-git-f4cd2b37b12617ca383e625dfd07ce1468c5b5a8.tar.gz | |
Merge 10.0-base -> mwl253
Diffstat (limited to 'sql/opt_range.h')
| -rw-r--r-- | sql/opt_range.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index 484f508e49c..d98bf1186e8 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -323,7 +323,7 @@ public: 0 Ok other Error */ - virtual int init_ror_merged_scan(bool reuse_handler) + virtual int init_ror_merged_scan(bool reuse_handler, MEM_ROOT *alloc) { DBUG_ASSERT(0); return 1; } /* @@ -473,7 +473,7 @@ public: uchar *cur_prefix); bool reverse_sorted() { return 0; } bool unique_key_range(); - int init_ror_merged_scan(bool reuse_handler); + int init_ror_merged_scan(bool reuse_handler, MEM_ROOT *alloc); void save_last_pos() { file->position(record); } int get_type() { return QS_TYPE_RANGE; } @@ -722,7 +722,7 @@ public: #ifndef DBUG_OFF void dbug_dump(int indent, bool verbose); #endif - int init_ror_merged_scan(bool reuse_handler); + int init_ror_merged_scan(bool reuse_handler, MEM_ROOT *alloc); bool push_quick_back(MEM_ROOT *alloc, QUICK_RANGE_SELECT *quick_sel_range); class QUICK_SELECT_WITH_RECORD : public Sql_alloc |