diff options
| author | unknown <monty@mysql.com> | 2005-11-24 04:08:07 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-24 04:08:07 +0200 |
| commit | c5349d884557ba7706a35e38c8cb35da1d332e00 (patch) | |
| tree | 439a23033b6cb0f1815201ada8b600383b2c6aef /sql/unireg.h | |
| parent | 039168c2fa724b9ed87ce2f19a7ea20acbd8a1de (diff) | |
| parent | 81b2bbac056f21b0783f21a5830c07aba4850d85 (diff) | |
| download | mariadb-git-c5349d884557ba7706a35e38c8cb35da1d332e00.tar.gz | |
Merge mysql.com:/home/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1-TDC
sql/ha_federated.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/examples/ha_tina.h:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 9c11bd90f14..6d26a9ba2f0 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -46,8 +46,8 @@ #define ERRMAPP 1 /* Errormap f|r my_error */ #define LIBLEN FN_REFLEN-FN_LEN /* Max l{ngd p} dev */ -#define MAX_DBKEY_LENGTH (FN_LEN*2+1+1+4+4) /* extra 4+4 bytes for slave tmp - * tables */ +/* extra 4+4 bytes for slave tmp tables */ +#define MAX_DBKEY_LENGTH (NAME_LEN*2+1+1+4+4) #define MAX_ALIAS_NAME 256 #define MAX_FIELD_NAME 34 /* Max colum name length +2 */ #define MAX_SYS_VAR_LENGTH 32 |