diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-11-09 18:02:08 +0200 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-11-09 18:02:08 +0200 |
| commit | 3d698ac61618f658e5a25219d3eb3b29b451db00 (patch) | |
| tree | affc497d6401ffe9001e7596d821e098ea1e3b44 /sql/sql_lifo_buffer.h | |
| parent | 594a8648ef133705638ef909667157cb47ae0aee (diff) | |
| download | mariadb-git-3d698ac61618f658e5a25219d3eb3b29b451db00.tar.gz | |
BUG#671361: virtual int Mrr_ordered_index_reader::refill_buffer(): Assertion `!know_key_tuple_params
- Make sure we have enough space for both rowids and keys.
Diffstat (limited to 'sql/sql_lifo_buffer.h')
| -rw-r--r-- | sql/sql_lifo_buffer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lifo_buffer.h b/sql/sql_lifo_buffer.h index 89b520484e4..8718177fc4f 100644 --- a/sql/sql_lifo_buffer.h +++ b/sql/sql_lifo_buffer.h @@ -112,7 +112,6 @@ public: virtual void reset() = 0; virtual uchar *end_of_space() = 0; protected: - virtual bool have_space_for(size_t bytes) = 0; virtual size_t used_size() = 0; /* To be used only by iterator class: */ @@ -120,6 +119,8 @@ protected: virtual bool read(uchar **position)= 0; friend class Lifo_buffer_iterator; public: + virtual bool have_space_for(size_t bytes) = 0; + virtual void remove_unused_space(uchar **unused_start, uchar **unused_end)=0; virtual uchar *used_area() = 0; virtual ~Lifo_buffer() {}; |