Merge with 4.1

1 files changed, 6 insertions, 2 deletions

diff --git a/sql/opt_range.h b/sql/opt_range.h
index b639ba6efa7..37d77033c8d 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -691,10 +691,14 @@ class SQL_SELECT :public Sql_alloc {
   ~SQL_SELECT();
   void cleanup();
   bool check_quick(THD *thd, bool force_quick_range, ha_rows limit)
-  { return test_quick_select(thd, key_map(~(uint)0), 0, limit, force_quick_range) < 0; }
+  {
+    key_map tmp;
+    tmp.set_all();
+    return test_quick_select(thd, tmp, 0, limit, force_quick_range) < 0;
+  }
   inline bool skip_record() { return cond ? cond->val_int() == 0 : 0; }
   int test_quick_select(THD *thd, key_map keys, table_map prev_tables,
-			ha_rows limit, bool force_quick_range=0);
+			ha_rows limit, bool force_quick_range);
 };