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

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/sql_select.h b/sql/sql_select.h
index 6c17a646ee6..aa77722546d 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -29,8 +29,8 @@ typedef struct keyuse_t {
   Item	*val;				/* or value if no field */
   table_map used_tables;
   uint	key, keypart, optimize;
-  key_map   keypart_map;
-  ha_rows   ref_table_rows;
+  key_part_map keypart_map;
+  ha_rows      ref_table_rows;
 } KEYUSE;
 
 class store_key;
@@ -96,9 +96,9 @@ typedef struct st_join_table {
   key_map	const_keys;			/* Keys with constant part */
   key_map	checked_keys;			/* Keys checked in find_best */
   key_map	needed_reg;
+  key_map       keys;                           /* all keys with can be used */
   ha_rows	records,found_records,read_time;
   table_map	dependent,key_dependent;
-  uint		keys;				/* all keys with can be used */
   uint		use_quick,index;
   uint		status;				// Save status for cache
   uint		used_fields,used_fieldlength,used_blobs;