diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 18859c3ad37..e0ca43e6d72 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -3015,8 +3015,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
     scan_time= read_time= DBL_MAX;
   if (limit < records)
     read_time= (double) records + scan_time + 1; // Force to use index
-  else if (read_time <= 2.0 && !force_quick_range)
-    DBUG_RETURN(0);				/* No need for quick select */
   
   possible_keys.clear_all();
 
@@ -3285,7 +3283,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
     thd->no_errors=0;
   }
 
-
   DBUG_EXECUTE("info", print_quick(quick, &needed_reg););
 
   /*
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 118602c5127..cbf723c1b49 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -6181,6 +6181,7 @@ bool check_stack_overrun(THD *thd, long margin,
   if ((stack_used=used_stack(thd->thread_stack,(char*) &stack_used)) >=
       (long) (my_thread_stack_size - margin))
   {
+    thd->is_fatal_error= 1;
     /*
       Do not use stack for the message buffer to ensure correct
       behaviour in cases we have close to no stack left.