diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-04-03 18:51:29 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-04-03 18:51:29 +0400 |
| commit | 78683672707bad90169b68b4c5d8aadc0e895f3d (patch) | |
| tree | c4e9de4dad68a9728c5bf606dc400fb1e6ddabfc /sql/opt_range.h | |
| parent | 599a1384af7d38e4319bd6258c6954750f5b9ba4 (diff) | |
| parent | 763af1a8a3a894df7326303b062bc55121103cb0 (diff) | |
| download | mariadb-git-78683672707bad90169b68b4c5d8aadc0e895f3d.tar.gz | |
Merge 5.3 -> 5.5
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 c59b2a7eb02..fff6e414ad9 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 |