diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-07-26 13:30:03 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-07-26 13:30:03 -0600 |
| commit | b60272915fc963af94fc84be025437077daf9455 (patch) | |
| tree | 013b79bac180d2a33fe74c0a1dc90d991ba8d160 /mysql-test/r/func_time.result | |
| parent | 39486004bbf13987b5962056bf0bf0ed4bf7b86d (diff) | |
| parent | 9d5b76eba92c48758a2d6df9159cf89ed187993c (diff) | |
| download | mariadb-git-b60272915fc963af94fc84be025437077daf9455.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/global-41
into siva.hindu.god:/usr/home/tim/m/bk/global-50
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 66fe355ffce..db696f61fed 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -758,6 +758,13 @@ select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')), monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m')); monthname(str_to_date(null, '%m')) monthname(str_to_date(null, '%m')) monthname(str_to_date(1, '%m')) monthname(str_to_date(0, '%m')) NULL NULL January NULL +set time_zone='-6:00'; +create table t1(a timestamp); +insert into t1 values (19691231190001); +select * from t1; +a +1969-12-31 19:00:01 +drop table t1; create table t1(f1 date, f2 time, f3 datetime); insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01"); insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02"); |