summaryrefslogtreecommitdiff
path: root/sql/opt_range.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-06-03 23:46:03 +0300
committermonty@mysql.com <>2005-06-03 23:46:03 +0300
commit29fd1f2fd93a9cad806814556be3eb0c53cd6c7c (patch)
tree1f3455d4bb48f50d0cf7630ce12209eefac021a2 /sql/opt_range.h
parentfd17d75923dd06471e1659d02832f2dbe22c8c70 (diff)
downloadmariadb-git-29fd1f2fd93a9cad806814556be3eb0c53cd6c7c.tar.gz
Move USE_PRAGMA_IMPLEMENTATION to proper place
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
Diffstat (limited to 'sql/opt_range.h')
-rw-r--r--sql/opt_range.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h
index b55bb4708bf..87e0315a09e 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -143,10 +143,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);
};