/* Reset quick;  This will be restored in 'use_filesort' if needed */
          select->quick= 0;
+         save_cond= select->cond;
+         select->cond= select->original_cond;
          res= select->test_quick_select(tab->join->thd, new_ref_key_map, 0,
                                         (tab->join->select_options &
                                          OPTION_FOUND_ROWS) ?
                                         HA_POS_ERROR :
                                         tab->join->unit->select_limit_cnt,0,
                                         TRUE) <= 0;
+        select->cond= save_cond;
          if (res)
            goto use_filesort;
	}