diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 15:33:21 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 15:33:21 +0300 |
| commit | da5edf5057d392f3647570606220d80106c81a7b (patch) | |
| tree | 922a9e1f2882014f8c5a5a5f524bf88e39ed41dd /storage/maria/ha_maria.cc | |
| parent | 19f6f52a21d48914a2542bcaf23806ace6870e8e (diff) | |
| download | mariadb-git-da5edf5057d392f3647570606220d80106c81a7b.tar.gz | |
MWL#67: MRR backport
- Make index condition pushdown be controlled by an @@optimizer_switch flag,
not by @@engine_condition_pushdown
- Make MRR buffer size be controlled by @@mrr_buffer_size, not
by @@read_rnd_buffer_size
- Move parts of code to separate files
- Code cleanup
- Add --sorted_result to some SELECTs in tests.
Diffstat (limited to 'storage/maria/ha_maria.cc')
| -rw-r--r-- | storage/maria/ha_maria.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 772989109d0..187cc3465bf 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -2022,16 +2022,15 @@ int ha_maria::delete_row(const uchar * buf) C_MODE_START -my_bool index_cond_func_maria(void *arg) +ICP_RESULT index_cond_func_maria(void *arg) { ha_maria *h= (ha_maria*)arg; - /*if (h->in_range_read)*/ if (h->end_range) { if (h->compare_key2(h->end_range) > 0) - return 2; /* caller should return HA_ERR_END_OF_FILE already */ + return ICP_OUT_OF_RANGE; /* caller should return HA_ERR_END_OF_FILE already */ } - return (my_bool)h->pushed_idx_cond->val_int(); + return h->pushed_idx_cond->val_int() ? ICP_MATCH : ICP_NO_MATCH; } C_MODE_END |