diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-12-20 14:40:12 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-12-20 14:40:12 +0300 |
| commit | 9d480f6af36db8ba098441bd58bfd60e547c8cd2 (patch) | |
| tree | a0299c52f33e2029c7ef9a10cb123e8ad8edf1ec /sql/multi_range_read.h | |
| parent | 09a84dc470b41914d10bcb5413017bbb4699536a (diff) | |
| download | mariadb-git-9d480f6af36db8ba098441bd58bfd60e547c8cd2.tar.gz | |
BUG#670417: Diverging results in maria-5.3-mwl128-dsmrr-cpk with join buffer
- Fixes for the second fix: take into account case where we don't need to save/restore the scan.
Diffstat (limited to 'sql/multi_range_read.h')
| -rw-r--r-- | sql/multi_range_read.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h index df6fc73ab52..fb0cd738855 100644 --- a/sql/multi_range_read.h +++ b/sql/multi_range_read.h @@ -270,9 +270,11 @@ public: return (mrr_funcs.skip_index_tuple && mrr_funcs.skip_index_tuple(mrr_iter, range_info)); } + + bool set_interruption_temp_buffer(uint rowid_length, uint key_len, + uchar **space_start, uchar *space_end); + void set_no_interruption_temp_buffer(); - bool set_temp_space(uint rowid_length, uint key_len, - uchar **space_start, uchar *space_end); void interrupt_read(); void resume_read(); void position(); @@ -299,6 +301,7 @@ private: /* TRUE == reached eof when enumerating ranges */ bool source_exhausted; + bool support_scan_interruptions; /* Space where we save the rowid of the last record we've returned. This is needed for the cases where index scan is interrupted by some other activity |