diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-09 16:21:27 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-09 16:21:27 +0500 |
| commit | 12fd56a9dad46feeba6f4472eb99671070e03b08 (patch) | |
| tree | a37c881437c3b8e303965d26f4671dabc790d406 /sql/item_timefunc.h | |
| parent | 3d57d91508e52acf4d5bc4fc929b443c1efb9961 (diff) | |
| parent | 1a5f13a12c2a31ffa1a1a5b846bd4ab6e321992f (diff) | |
| download | mariadb-git-12fd56a9dad46feeba6f4472eb99671070e03b08.tar.gz | |
Merge mysql.com:/home/ram/work/b31249/b31249.5.0
into mysql.com:/home/ram/work/b31249/b31249.5.1
sql/item_timefunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/type_datetime.result:
manual merge.
mysql-test/t/type_datetime.test:
manual merge.
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 36556269d07..5503a172825 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -847,7 +847,9 @@ public: } void fix_length_and_dec() { - Item_typecast_maybe_null::fix_length_and_dec(); + collation.set(&my_charset_bin); + maybe_null= 1; + max_length= MAX_DATETIME_FULL_WIDTH * MY_CHARSET_BIN_MB_MAXLEN; decimals= DATETIME_DEC; } bool result_as_longlong() { return TRUE; } |