diff options
| author | brian@zim.(none) <> | 2005-08-30 14:40:02 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2005-08-30 14:40:02 -0700 |
| commit | 57403ddc9da2a2fa153629f3564c662cb0de405e (patch) | |
| tree | fb387d75c6bc8131e0d735a74cc6ab053e56c186 /sql/unireg.h | |
| parent | b423cbf2ce44e7abf162b4a59e288c1562a2e39e (diff) | |
| parent | 2b0c81c984af1ab4d9f30b2d089102a13f507079 (diff) | |
| download | mariadb-git-57403ddc9da2a2fa153629f3564c662cb0de405e.tar.gz | |
Merge zim.(none):/home/brian/mysql/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.1
Resolved to minor issues.
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index aafb96ef7c3..2f1d3c2082d 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -50,7 +50,11 @@ #define MAX_SYS_VAR_LENGTH 32 #define MAX_KEY 64 /* Max used keys */ #define MAX_REF_PARTS 16 /* Max parts used as ref */ -#define MAX_KEY_LENGTH 1024 /* max possible key */ +#if SIZEOF_CHARP > 4 +#define MAX_KEY_LENGTH 3072 /* max possible key, if 64 bits */ +#else +#define MAX_KEY_LENGTH 1024 /* max possible key, if 32 bits */ +#endif #if SIZEOF_OFF_T > 4 #define MAX_REFLENGTH 8 /* Max length for record ref */ #else |