diff options
author | unknown <ingo@mysql.com> | 2005-12-06 08:31:38 +0100 |
---|---|---|
committer | unknown <ingo@mysql.com> | 2005-12-06 08:31:38 +0100 |
commit | 4c2f929eb7bac7dc3dcc8464c205279110f7a975 (patch) | |
tree | 58e31f753db05022bdd822937403c4fafc125ac4 /sql/unireg.h | |
parent | 002101a4c9d06d598d62d4204e9dd4cabc8621c8 (diff) | |
parent | f77305608ee22e31cf79cce780ffc0256c32e2b6 (diff) | |
download | mariadb-git-4c2f929eb7bac7dc3dcc8464c205279110f7a975.tar.gz |
Merge mysql.com:/home/mydev/mysql-5.0-bug10932
into mysql.com:/home/mydev/mysql-5.1-bug10932
include/myisam.h:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/unireg.h:
Auto merged
configure.in:
SCCS merged
Diffstat (limited to 'sql/unireg.h')
-rw-r--r-- | sql/unireg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index f6c4b5f3048..9ab8753af84 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -51,7 +51,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 MAX_INDEXES /* Max used keys */ #define MAX_REF_PARTS 16 /* Max parts used as ref */ #define MAX_KEY_LENGTH 3072 /* max possible key */ #if SIZEOF_OFF_T > 4 |