diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-12-30 23:44:42 +0300 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-12-30 23:44:42 +0300 |
| commit | 0e302f5e8bdbcb6df7d6a1fb78b0d784dfb798d8 (patch) | |
| tree | 034cd41311f5191200ab752ee86ddd489d204b26 /sql | |
| parent | e107535fa2c41862fa0e1faa68d0e693a45f1b64 (diff) | |
| download | mariadb-git-0e302f5e8bdbcb6df7d6a1fb78b0d784dfb798d8.tar.gz | |
Merged fixes for bug #7297 "Two digit year should be interpreted
correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.
mysql-test/r/ps_2myisam.result:
Updated test result after merging fix for bug #7297 "Two digit year should
be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_3innodb.result:
Updated test result after merging fix for bug #7297 "Two digit year should
be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_4heap.result:
Updated test result after merging fix for bug #7297 "Two digit year should
be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_5merge.result:
Updated test result after merging fix for bug #7297 "Two digit year should
be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_6bdb.result:
Updated test result after merging fix for bug #7297 "Two digit year should
be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_7ndb.result:
Updated test result after merging fix for bug #7297 "Two digit year should
be interpreted correctly even with zero month and day" into 4.1
sql-common/my_time.c:
Merged fix for bug #7297 "Two digit year should be interpreted correctly
even with zero month and day" into 4.1
sql/item_timefunc.cc:
Small fix after merging patch solving bug #7515 "from_unixtime(0) now
returns NULL instead of the Epoch" into 4.1.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_timefunc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 6198043b576..0d652a431cb 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1597,6 +1597,7 @@ void Item_func_from_unixtime::fix_length_and_dec() collation.set(&my_charset_bin); decimals=0; max_length=MAX_DATETIME_WIDTH*MY_CHARSET_BIN_MB_MAXLEN; + maybe_null= 1; thd->time_zone_used= 1; } |