diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-23 14:17:01 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-23 14:17:01 +0500 |
| commit | 9d5b76eba92c48758a2d6df9159cf89ed187993c (patch) | |
| tree | b211feabcc6fab041d6cb19a25bab48d948e91b7 /mysql-test/r/func_time.result | |
| parent | c988ef942fed9688fd2bd126af1e6946bbdd531d (diff) | |
| parent | 23006f9b54247c9a99892e0e7d12aa034b69488d (diff) | |
| download | mariadb-git-9d5b76eba92c48758a2d6df9159cf89ed187993c.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b16327
sql/field.cc:
Auto merged
mysql-test/r/func_time.result:
merging
mysql-test/t/func_time.test:
merging
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 fab0bf01f58..d8ba606a558 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -636,6 +636,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"); |