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.

1 files changed, 3 insertions, 3 deletions

diff --git a/storage/myisam/mi_rnext.c b/storage/myisam/mi_rnext.c
index ad5ec60dc98..584b7194ed1 100644
--- a/storage/myisam/mi_rnext.c
+++ b/storage/myisam/mi_rnext.c
@@ -28,7 +28,7 @@ int mi_rnext(MI_INFO *info, uchar *buf, int inx)
 {
   int error,changed;
   uint flag;
-  int res= 0;
+  ICP_RESULT res= 0;
   DBUG_ENTER("mi_rnext");
 
   if ((inx = _mi_check_index(info,inx)) < 0)
@@ -87,7 +87,7 @@ int mi_rnext(MI_INFO *info, uchar *buf, int inx)
     while ((info->s->concurrent_insert &&
             info->lastpos >= info->state->data_file_length) ||
            (info->index_cond_func &&
-           !(res= mi_check_index_cond(info, inx, buf))))
+           (res= mi_check_index_cond(info, inx, buf)) == ICP_NO_MATCH))
     {
       /* 
          Skip rows that are either inserted by other threads since
@@ -100,7 +100,7 @@ int mi_rnext(MI_INFO *info, uchar *buf, int inx)
                                   info->s->state.key_root[inx])))
         break;
     }
-    if (!error && res == 2)
+    if (!error && res == ICP_OUT_OF_RANGE)
     {
       if (info->s->concurrent_insert)
         rw_unlock(&info->s->key_root_lock[inx]);