bk commit into 5.0 tree (ingo:1.1956) BUG#10932

[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.1956 05/07/20 08:34:47 ingo@stripped +6 -0
  Bug#10932 - Building server with key limit of 128, makes test cases fail
  Added conditional definitions for 128 indexes.
  Added a configure macro to recognize the option --with-indexes-128.

  tests/mysql_client_test.c
    1.143 05/07/20 08:34:41 ingo@stripped +4 -0
    Bug#10932 - Building server with key limit of 128, makes test cases fail
    Added conditional definition for 128 indexes.

  sql/unireg.h
    1.40 05/07/20 08:34:41 ingo@stripped +5 -1
    Bug#10932 - Building server with key limit of 128, makes test cases fail
    Added conditional definition for 128 indexes.

  sql/mysql_priv.h
    1.329 05/07/20 08:34:41 ingo@stripped +5 -1
    Bug#10932 - Building server with key limit of 128, makes test cases fail
    Added conditional definition for 128 indexes.

  include/myisam.h
    1.68 05/07/20 08:34:41 ingo@stripped +4 -0
    Bug#10932 - Building server with key limit of 128, makes test cases fail
    Added conditional definition for 128 indexes.

  configure.in
    1.325 05/07/20 08:34:41 ingo@stripped +1 -0
    Bug#10932 - Building server with key limit of 128, makes test cases fail
    Added a call of macro MYSQL_CHECK_INDEXES_128 for --with-indexes-128.

  config/ac-macros/misc.m4
    1.11 05/07/20 08:34:41 ingo@stripped +29 -0
    Bug#10932 - Building server with key limit of 128, makes test cases fail
    Added the macro MYSQL_CHECK_INDEXES_128 for --with-indexes-128.

# 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

--- 1.324/configure.in	2005-07-19 01:01:20 +02:00
+++ 1.325/configure.in	2005-07-20 08:34:41 +02:00
@@ -2428,6 +2428,7 @@
 AC_SUBST(readline_h_ln_cmd)
 
 MYSQL_CHECK_BIG_TABLES
+MYSQL_CHECK_INDEXES_128
 MYSQL_CHECK_BDB
 MYSQL_CHECK_INNODB
 MYSQL_CHECK_EXAMPLEDB

--- 1.67/include/myisam.h	2005-07-19 14:13:36 +02:00
+++ 1.68/include/myisam.h	2005-07-20 08:34:41 +02:00
@@ -50,7 +50,11 @@
   The following defines can be increased if necessary.
   BUT: MI_MAX_KEY must be <= MI_MAX_POSSIBLE_KEY.
 */
+#ifdef INDEXES_128
+#define MI_MAX_KEY                  128             /* Max allowed keys */
+#else
 #define MI_MAX_KEY                  64              /* Max allowed keys */
+#endif
 #define MI_MAX_KEY_SEG              16              /* Max segments for key */
 #define MI_MAX_KEY_LENGTH           1000
 

--- 1.328/sql/mysql_priv.h	2005-07-16 14:10:36 +02:00
+++ 1.329/sql/mysql_priv.h	2005-07-20 08:34:41 +02:00
@@ -41,7 +41,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 */
+#ifdef INDEXES_128
+typedef Bitmap<128> key_map;          /* Used for finding keys */
+#else
+typedef Bitmap<64>  key_map;          /* Used for finding keys */
+#endif
 typedef ulong key_part_map;           /* Used for finding key parts */
 
 /* query_id */

--- 1.39/sql/unireg.h	2005-02-07 18:38:45 +01:00
+++ 1.40/sql/unireg.h	2005-07-20 08:34:41 +02:00
@@ -48,7 +48,11 @@
 #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 */
+#ifdef INDEXES_128
+#define MAX_KEY 128                             /* Max used keys */
+#else
+#define MAX_KEY 64                              /* Max used keys */
+#endif
 #define MAX_REF_PARTS 16			/* Max parts used as ref */
 #define MAX_KEY_LENGTH 1024			/* max possible key */
 #if SIZEOF_OFF_T > 4

--- 1.10/config/ac-macros/misc.m4	2005-06-22 13:29:16 +02:00
+++ 1.11/config/ac-macros/misc.m4	2005-07-20 08:34:41 +02:00
@@ -693,6 +693,35 @@
 dnl END OF MYSQL_CHECK_BIG_TABLES SECTION
 dnl ---------------------------------------------------------------------------
 
+
+dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_CHECK_INDEXES_128
+dnl Sets INDEXES_128 if --with-indexes-128 is used
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([MYSQL_CHECK_INDEXES_128], [
+  AC_ARG_WITH([indexes-128],
+              [
+  --with-indexes-128      Support 128 indexes per table],
+              [indexes_128="$withval"],
+              [indexes_128=no])
+  AC_MSG_CHECKING([for indexes 128 support])
+
+  case "$indexes_128" in
+    yes )
+      AC_DEFINE([INDEXES_128], [1], [Support 128 indexes per table])
+      AC_MSG_RESULT([yes])
+      ;;
+    * )
+      AC_MSG_RESULT([no])
+      ;;
+  esac
+
+])
+dnl ---------------------------------------------------------------------------
+dnl END OF MYSQL_CHECK_INDEXES_128 SECTION
+dnl ---------------------------------------------------------------------------
+
+
 dnl MYSQL_NEEDS_MYSYS_NEW
 AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],
 [AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new,

--- 1.142/tests/mysql_client_test.c	2005-07-18 22:49:16 +02:00
+++ 1.143/tests/mysql_client_test.c	2005-07-20 08:34:41 +02:00
@@ -36,7 +36,11 @@
 
 #define VER "2.1"
 #define MAX_TEST_QUERY_LENGTH 300 /* MAX QUERY BUFFER LENGTH */
+#ifdef INDEXES_128
+#define MAX_KEY 128
+#else
 #define MAX_KEY 64
+#endif
 #define MAX_SERVER_ARGS 64
 
 /* set default options */