summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-06-22 23:26:11 +0400
committerSergey Petrunya <psergey@askmonty.org>2010-06-22 23:26:11 +0400
commit488d352a662438a3c34fd1b41261a94be7572f38 (patch)
tree8bda7e1ff12dea071084f5726a1a8fe60c496387 /storage/myisam
parentb45748f058e00b941d7b737cc43dcc3ad237d5d3 (diff)
downloadmariadb-git-488d352a662438a3c34fd1b41261a94be7572f38.tar.gz
MWL#121: DS-MRR support for clustered primary keys
- Remove back key_parts from multi_range_read_init() parameters - Related code simplification/cleanup
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/ha_myisam.cc4
-rw-r--r--storage/myisam/ha_myisam.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index bb6ac446a4f..95ab5cb167e 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -2217,10 +2217,10 @@ static int myisam_init(void *p)
***************************************************************************/
int ha_myisam::multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
- uint n_ranges, uint key_parts, uint mode,
+ uint n_ranges, uint mode,
HANDLER_BUFFER *buf)
{
- return ds_mrr.dsmrr_init(this, seq, seq_init_param, n_ranges, key_parts, mode, buf);
+ return ds_mrr.dsmrr_init(this, seq, seq_init_param, n_ranges, mode, buf);
}
int ha_myisam::multi_range_read_next(char **range_info)
diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h
index d37870b861b..f5428e653c4 100644
--- a/storage/myisam/ha_myisam.h
+++ b/storage/myisam/ha_myisam.h
@@ -162,8 +162,7 @@ public:
* Multi Range Read interface
*/
int multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
- uint n_ranges, uint key_parts, uint mode,
- HANDLER_BUFFER *buf);
+ uint n_ranges, uint mode, HANDLER_BUFFER *buf);
int multi_range_read_next(char **range_info);
ha_rows multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
void *seq_init_param,