summaryrefslogtreecommitdiff
path: root/sql/multi_range_read.h
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2013-09-20 14:47:38 +0400
committerSergey Petrunya <psergey@askmonty.org>2013-09-20 14:47:38 +0400
commit422c55a2404a7ec31d43962cdda0d782ef32dc45 (patch)
tree4310e7a0342103f322325b1c936374a0600cc178 /sql/multi_range_read.h
parent33f807fd91826013499c996f9515838cf2c6d0c5 (diff)
downloadmariadb-git-422c55a2404a7ec31d43962cdda0d782ef32dc45.tar.gz
MDEV-5037: Server crash on a JOIN on a derived table with join_cache_level > 2
- The crash was caused because the optimizer called handler->multi_range_read_info() on a derived temporary table. That table has been created, but not opened yet. Because of that, handler::table was NULL, which caused crash. Fixed by changing DS-MRR methods to use handler::table_share instead. handler::table_share is set in handler ctor, so this should be safe.
Diffstat (limited to 'sql/multi_range_read.h')
-rw-r--r--sql/multi_range_read.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h
index dcba92aab16..10715817308 100644
--- a/sql/multi_range_read.h
+++ b/sql/multi_range_read.h
@@ -627,7 +627,7 @@ private:
COST_VECT *cost);
bool get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags,
uint *buffer_size, COST_VECT *cost);
- bool check_cpk_scan(THD *thd, uint keyno, uint mrr_flags);
+ bool check_cpk_scan(THD *thd, TABLE_SHARE *share, uint keyno, uint mrr_flags);
bool setup_buffer_sharing(uint key_size_in_keybuf, key_part_map key_tuple_map);