===== include/myisam.h 1.66 vs edited =====
--- 1.66/include/myisam.h	2005-05-13 11:08:02 +02:00
+++ edited/include/myisam.h	2005-05-25 01:35:26 +02:00
@@ -36,7 +36,7 @@
 	/* defines used by myisam-funktions */
 
 /* The following defines can be increased if necessary */
-#define MI_MAX_KEY	64		/* Max allowed keys */
+#define MI_MAX_KEY	128		/* Max allowed keys */
 #define MI_MAX_KEY_SEG	16		/* Max segments for key */
 #define MI_MAX_KEY_LENGTH 1000
 
===== sql/mysql_priv.h 1.298 vs edited =====
--- 1.298/sql/mysql_priv.h	2005-05-19 22:04:00 +02:00
+++ edited/sql/mysql_priv.h	2005-05-25 01:20:09 +02:00
@@ -41,7 +41,7 @@
 
 /* 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 */
+typedef Bitmap<128> key_map;          /* Used for finding keys */
 typedef ulong key_part_map;           /* Used for finding key parts */
 
 /* query_id */
===== sql/unireg.h 1.39 vs edited =====
--- 1.39/sql/unireg.h	2005-02-07 18:38:45 +01:00
+++ edited/sql/unireg.h	2005-05-25 01:21:39 +02:00
@@ -48,7 +48,7 @@
 #define MAX_ALIAS_NAME 256
 #define MAX_FIELD_NAME 34			/* Max colum name length +2 */
 #define MAX_SYS_VAR_LENGTH 32
-#define MAX_KEY 64				/* Max used keys */
+#define MAX_KEY 128				/* Max used keys */
 #define MAX_REF_PARTS 16			/* Max parts used as ref */
 #define MAX_KEY_LENGTH 1024			/* max possible key */
 #if SIZEOF_OFF_T > 4
===== sql/sql_bitmap.h 1.7 vs edited =====
--- 1.7/sql/sql_bitmap.h	2005-05-05 09:11:39 +02:00
+++ edited/sql/sql_bitmap.h	2005-05-27 04:44:38 +02:00
@@ -28,7 +28,7 @@
   uchar buffer[(default_width+7)/8];
 public:
   Bitmap() { init(); }
-  Bitmap(Bitmap& from) { *this=from; }
+/*  Bitmap(Bitmap& from) { *this=from; } */
   explicit Bitmap(uint prefix_to_set) { init(prefix_to_set); }
   void init() { bitmap_init(&map, buffer, default_width, 0); }
   void init(uint prefix_to_set) { init(); set_prefix(prefix_to_set); }
@@ -82,7 +82,7 @@
     if (sizeof(buffer) >= 8)
       return uint8korr(buffer);
     DBUG_ASSERT(sizeof(buffer) >= 4);
-    uint4korr(buffer);
+    return (ulonglong)uint4korr(buffer);
   }
 };