diff options
author | unknown <petr/cps@outpost.site> | 2006-11-06 00:11:34 +0300 |
---|---|---|
committer | unknown <petr/cps@outpost.site> | 2006-11-06 00:11:34 +0300 |
commit | e5bd94b2d4fd6937a0f5ff53a295fe14a83ccaef (patch) | |
tree | 30d8ec2b0bdec298709d288e24cd14d7fd20989c /sql/mysql_priv.h | |
parent | b4973524581aa65edd0ccef339bc2e47c2351602 (diff) | |
parent | c96eaa43ab1c486fb729ca099ccdb1f7336525eb (diff) | |
download | mariadb-git-e5bd94b2d4fd6937a0f5ff53a295fe14a83ccaef.tar.gz |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 165bedb3659..cd6c2a73ccc 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -212,12 +212,6 @@ MY_LOCALE *my_locale_by_name(const char *name); /* Characters shown for the command in 'show processlist' */ #define PROCESS_LIST_WIDTH 100 -/* Time handling defaults */ -#define TIMESTAMP_MAX_YEAR 2038 -#define YY_PART_YEAR 70 -#define TIMESTAMP_MIN_YEAR (1900 + YY_PART_YEAR - 1) -#define TIMESTAMP_MAX_VALUE 2145916799 -#define TIMESTAMP_MIN_VALUE 1 #define PRECISION_FOR_DOUBLE 53 #define PRECISION_FOR_FLOAT 24 |