bk commit into 5.0 tree (ingo:1.1970)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1970 05/12/12 13:24:08 ingo@stripped +1 -0
  Merge istruewing@stripped:/home/bk/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-bug10932

  sql/mysql_priv.h
    1.371 05/12/12 13:24:01 ingo@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-bug10932/RESYNC

--- 1.370/sql/mysql_priv.h	2005-12-11 08:30:52 +01:00
+++ 1.371/sql/mysql_priv.h	2005-12-12 13:24:01 +01:00
@@ -42,7 +42,11 @@
 
 /* TODO convert all these three maps to Bitmap classes */
 typedef ulonglong table_map;          /* Used for table bits in join */
-typedef Bitmap<64> key_map;           /* Used for finding keys */
+#if MAX_INDEXES <= 64
+typedef Bitmap<64>  key_map;          /* Used for finding keys */
+#else
+typedef Bitmap<((MAX_INDEXES+7)/8*8)> key_map; /* Used for finding keys */
+#endif
 typedef ulong key_part_map;           /* Used for finding key parts */
 typedef ulong nesting_map;  /* Used for flags of nesting constructs */
 /*