diff options
| author | unknown <gbichot@production.mysql.com> | 2005-03-22 00:28:33 +0100 |
|---|---|---|
| committer | unknown <gbichot@production.mysql.com> | 2005-03-22 00:28:33 +0100 |
| commit | a2bf9d52eeedf679eac7df9584997bc5e0c69740 (patch) | |
| tree | f26bb4d4c7bd39c3ca6a2cedc0f700acdc75416b /sql/mysql_priv.h | |
| parent | 61f1e9a3e4257df5849723c7c0a68f537db25f75 (diff) | |
| parent | ac46bf77aecd84eae40400afd5ffb79e93ab4b24 (diff) | |
| download | mariadb-git-a2bf9d52eeedf679eac7df9584997bc5e0c69740.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
BitKeeper/etc/logging_ok:
auto-union
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index dfa945c3fd3..1ee53e5ed64 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -264,6 +264,12 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; /* Flag set if setup_tables already done */ #define OPTION_SETUP_TABLES_DONE (1L << 30) +/* + Maximum length of time zone name that we support + (Time zone name is char(64) in db). mysqlbinlog needs it. +*/ +#define MAX_TIME_ZONE_NAME_LENGTH 72 + /* The rest of the file is included in the server only */ #ifndef MYSQL_CLIENT |