diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-09 17:56:08 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-09 17:56:08 -0700 |
| commit | ddd55d4349cef4002d8724eac7f2735538d55d02 (patch) | |
| tree | a35d4a02dd33f64c0522f3313f41b5814ac15fbf /sql/item_timefunc.h | |
| parent | 8e418820e9f6e82691a3b489a951e78af4feaba2 (diff) | |
| parent | 5efb70d7771c905b61e5e01e2f0643a5953adb83 (diff) | |
| download | mariadb-git-ddd55d4349cef4002d8724eac7f2735538d55d02.tar.gz | |
Merge rurik.mysql.com:/home/igor/tmp_merge
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
VC++Files/client/mysql.dsp:
Auto merged
mysql-test/t/func_time.test:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
client/mysqldump.c:
Manual merge
mysql-test/r/func_time.result:
Manual merge
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index b2f0dab0837..9a14b961130 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -614,6 +614,7 @@ public: { collation.set(&my_charset_bin); maybe_null=1; + decimals= DATETIME_DEC; max_length=MAX_TIME_WIDTH*MY_CHARSET_BIN_MB_MAXLEN; } enum_field_types field_type() const { return MYSQL_TYPE_TIME; } |