Merge polly.(none):/home/kaa/src/opt/bug25421/my51-bug31445

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


sql/opt_range.cc:
  Auto merged

sql/opt_range.cc

@@ -7352,6 +7352,9 @@ check_quick_keys(PARAM *param, uint idx, SEL_ARG *key_tree,
     tmp_max_flag= max_key_flag | key_tree->max_flag;
   }
 
+  if (unlikely(param->thd->killed != 0))
+    return HA_POS_ERROR;
+  
   keynr=param->real_keynr[idx];
   param->range_count++;
   if (!tmp_min_flag && ! tmp_max_flag &&