diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-07-16 13:38:23 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-07-16 13:38:23 +0400 |
| commit | e1006e9e1f33420d6002660efee4d38f4baa7677 (patch) | |
| tree | ee314edd36b8bc3448a111060c1baa47106186ce /storage/myisam | |
| parent | 75bba30c5a0e65e3f5501492603370c7afc9444b (diff) | |
| parent | 488d352a662438a3c34fd1b41261a94be7572f38 (diff) | |
| download | mariadb-git-e1006e9e1f33420d6002660efee4d38f4baa7677.tar.gz | |
MWL#121: DS-MRR support for clustered primary keys
- Merge with current 5.3
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 6 | ||||
| -rw-r--r-- | storage/myisam/ha_myisam.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 8f30f31f0db..c70c43dd528 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -2206,11 +2206,11 @@ ha_rows ha_myisam::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, } ha_rows ha_myisam::multi_range_read_info(uint keyno, uint n_ranges, uint keys, - uint *bufsz, uint *flags, - COST_VECT *cost) + uint key_parts, uint *bufsz, + uint *flags, COST_VECT *cost) { ds_mrr.init(this, table); - return ds_mrr.dsmrr_info(keyno, n_ranges, keys, bufsz, flags, cost); + return ds_mrr.dsmrr_info(keyno, n_ranges, keys, key_parts, bufsz, flags, cost); } /* MyISAM MRR implementation ends */ diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h index db3c4737811..e4e043a0a2a 100644 --- a/storage/myisam/ha_myisam.h +++ b/storage/myisam/ha_myisam.h @@ -168,7 +168,8 @@ public: uint n_ranges, uint *bufsz, uint *flags, COST_VECT *cost); ha_rows multi_range_read_info(uint keyno, uint n_ranges, uint keys, - uint *bufsz, uint *flags, COST_VECT *cost); + uint key_parts, uint *bufsz, + uint *flags, COST_VECT *cost); /* Index condition pushdown implementation */ Item *idx_cond_push(uint keyno, Item* idx_cond); |