diff options
| author | unknown <jimw@mysql.com> | 2005-12-01 15:14:51 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-12-01 15:14:51 -0800 |
| commit | 15a1774eec672713e82c8a67b942619936d4ede7 (patch) | |
| tree | ade25f66ccfc90cca17aed2534b98f53dd48b5f4 /sql/unireg.h | |
| parent | 8705383af328b7adccb949389ff164b1cc2b9c1a (diff) | |
| parent | 025d8c14f64c9df4e5942de963234516adf7ffea (diff) | |
| download | mariadb-git-15a1774eec672713e82c8a67b942619936d4ede7.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
client/mysqldump.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/r/mysqldump.result:
Fix conflict
mysql-test/t/mysqldump.test:
Fix conflict
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 6d26a9ba2f0..f6c4b5f3048 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -53,11 +53,7 @@ #define MAX_SYS_VAR_LENGTH 32 #define MAX_KEY 64 /* Max used keys */ #define MAX_REF_PARTS 16 /* Max parts used as ref */ -#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 +#define MAX_KEY_LENGTH 3072 /* max possible key */ #if SIZEOF_OFF_T > 4 #define MAX_REFLENGTH 8 /* Max length for record ref */ #else |