diff options
| author | unknown <brian@zim.(none)> | 2005-08-30 14:40:02 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-08-30 14:40:02 -0700 |
| commit | 9ea1d5e293a0a12b1be1d305d1a88e2aae18a4ba (patch) | |
| tree | fb387d75c6bc8131e0d735a74cc6ab053e56c186 /sql/unireg.h | |
| parent | 172392f272b65ce630e3c56790ed76e666af3903 (diff) | |
| parent | 8d17360181f9b27295fe18e6f4137b8af1fc2d06 (diff) | |
| download | mariadb-git-9ea1d5e293a0a12b1be1d305d1a88e2aae18a4ba.tar.gz | |
Merge zim.(none):/home/brian/mysql/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.1
Resolved to minor issues.
BitKeeper/etc/config:
Auto merged
Makefile.am:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
extra/perror.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysys/Makefile.am:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/table.h:
Auto merged
sql/unireg.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
storage/myisam/myisamlog.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
configure.in:
Fixed the resolve of versions.
mysql-test/r/alter_table.result:
Fixed results.
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 |