summaryrefslogtreecommitdiff
path: root/sql/opt_sum.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-10-11 13:06:55 +0200
committerunknown <serg@serg.mylan>2003-10-11 13:06:55 +0200
commit2e1115edc1b5899975c33b4367256ce650d3a0f4 (patch)
treeff3da12e7e88d561877cd7b6f3fe64edad0c10c0 /sql/opt_sum.cc
parent7154615de30122f4dcf719b11fcbc32563ff11d2 (diff)
downloadmariadb-git-2e1115edc1b5899975c33b4367256ce650d3a0f4.tar.gz
key_map with more that 64 bits width
sql/field.cc: typedef Bitmap<64> key_map all tests pass sql/ha_berkeley.cc: typedef Bitmap<64> key_map all tests pass sql/ha_berkeley.h: typedef Bitmap<64> key_map all tests pass sql/item.cc: typedef Bitmap<64> key_map all tests pass sql/item_func.cc: typedef Bitmap<64> key_map all tests pass sql/opt_sum.cc: typedef Bitmap<64> key_map all tests pass sql/sql_delete.cc: typedef Bitmap<64> key_map all tests pass sql/sql_show.cc: typedef Bitmap<64> key_map all tests pass sql/sql_test.cc: typedef Bitmap<64> key_map all tests pass sql/sql_update.cc: typedef Bitmap<64> key_map all tests pass include/my_bitmap.h: more bitmap methods mysys/my_bitmap.c: more bitmap methods sql/field.h: init bitmaps sql/ha_innodb.h: optimization sql/ha_isam.cc: optimization sql/ha_myisam.cc: optimization sql/ha_myisammrg.cc: optimization sql/handler.h: optimization sql/mysqld.cc: bitmap_init() interface changed sql/opt_range.cc: optimization sql/opt_range.h: optimization sql/slave.cc: bitmap_init() interface changed sql/sql_base.cc: optimization sql/sql_select.cc: init bitmaps using const for bitmaps whenever possible sql/sql_select.h: cleanup sql/table.cc: always init bitmaps BitKeeper/etc/ignore: Added sql/udf_example.so to the ignore list sql/mysql_priv.h: use Bitmap over ulonglong by default
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r--sql/opt_sum.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 34cce98d087..932aceebdbb 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -683,7 +683,7 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref,
The following test is false when the key in the key tree is
converted (for example to upper case)
*/
- if (field->part_of_key & ((key_map) 1 << idx))
+ if (field->part_of_key.is_set(idx))
{
table->key_read= 1;
table->file->extra(HA_EXTRA_KEYREAD);
@@ -696,7 +696,7 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref,
return 0;
}
-
+
/*
Check whether found key is in range specified by conditions
@@ -707,7 +707,7 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref,
field in: Field used the MIN/MAX expression
cond in: WHERE condition
range_fl in: Says whether there is a condition to to be checked
- prefix_len in: Length of the constant part of the key
+ prefix_len in: Length of the constant part of the key
RETURN
0 ok