Manual merge.

2bc1b8a7 · Alexey Kopytov · dd211998 · ce3d6c97 · 2bc1b8a7
Commit 2bc1b8a7 authored Jul 15, 2010 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/opt_range.cc sql/opt_range.cc +1 -1

No files found.
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -7619,7 +7619,7 @@ check_quick_keys(PARAM *param, uint idx, SEL_ARG *key_tree,

  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 &&