diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-06-11 10:49:26 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-06-11 10:49:26 -0600 |
| commit | 62c807a72d6a412bce2fa353ae4605854660e3ff (patch) | |
| tree | 91e32b38a5e2fe7ebe5e09f88884ed02d7c1c231 /sql/unireg.h | |
| parent | 97cf2694a133eb9b3fc8e81eea66964b2446b864 (diff) | |
| parent | 0e958122e197f4d02cf07040e4cb24af460ab15e (diff) | |
| download | mariadb-git-62c807a72d6a412bce2fa353ae4605854660e3ff.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge50
sql/item_timefunc.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index d67fa372083..5b73c6e9caa 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -74,6 +74,7 @@ #define MAX_TIME_WIDTH 23 /* -DDDDDD HH:MM:SS.###### */ #define MAX_DATETIME_FULL_WIDTH 29 /* YYYY-MM-DD HH:MM:SS.###### AM */ #define MAX_DATETIME_WIDTH 19 /* YYYY-MM-DD HH:MM:SS */ +#define MAX_DATETIME_COMPRESSED_WIDTH 14 /* YYYYMMDDHHMMSS */ #define MAX_TABLES (sizeof(table_map)*8-3) /* Max tables in join */ #define PARAM_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-3)) |