summaryrefslogtreecommitdiff
path: root/sql/multi_range_read.h
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-09-15 16:58:01 +0400
committerSergey Petrunya <psergey@askmonty.org>2010-09-15 16:58:01 +0400
commit499b142ad512fcaf3b0bf2bf8073a4983445dc06 (patch)
tree9637fe02efbe10fb7bb3f9a70d26426263d3569d /sql/multi_range_read.h
parent3a5c004bb5c860a337ec7469596d18ce1ae28702 (diff)
downloadmariadb-git-499b142ad512fcaf3b0bf2bf8073a4983445dc06.tar.gz
BUG#628785: multi_range_read.cc:430: int DsMrr_impl::dsmrr_init(): Assertion `do_sort_keys || do_rowid_fetch' failed
- Make Ds_MrrImpl::check_cpk_scan() follow the execution code' logic: don't do MRR scans on clustered PK when mrr_sort_keys=off.
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 5eaff483c47..9cd1503596f 100644
--- a/sql/multi_range_read.h
+++ b/sql/multi_range_read.h
@@ -384,7 +384,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(uint keyno, uint mrr_flags);
+ bool check_cpk_scan(THD *thd, uint keyno, uint mrr_flags);
static int key_tuple_cmp(void* arg, uchar* key1, uchar* key2);
int dsmrr_fill_rowid_buffer();
void dsmrr_fill_key_buffer();