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

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

Merge polly.(none):/home/kaa/src/opt/bug25421/my51-bug31445
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2045fdb5 · kaa@polly.(none) · 9f6febf9 · 3ebb915d · 2045fdb5
Commit 2045fdb5 authored Nov 07, 2007 by kaa@polly.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/opt_range.cc sql/opt_range.cc +3 -0

No files found.
--- a/sql/opt_range.cc
+++ b/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 &&