diff options
| author | unknown <dlenev@mysql.com> | 2005-01-28 09:32:43 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-01-28 09:32:43 +0300 |
| commit | bf89dc063a6576cb08f2da29c8f505846965590b (patch) | |
| tree | 6ab480710ff3945ba2b743ac5acb104b3f7d3f02 /mysql-test/r/timezone2.result | |
| parent | 418a06308b6abe8462f5942e0dcf4455fb2073b5 (diff) | |
| parent | 20bd0bd6fd693eec59ed1de47a27b46f2af6df3b (diff) | |
| download | mariadb-git-bf89dc063a6576cb08f2da29c8f505846965590b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
sql/item_timefunc.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/tztime.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/timezone2.result')
| -rw-r--r-- | mysql-test/r/timezone2.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result index a1a2fec739f..206ff79e7ba 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -303,3 +303,11 @@ delete from mysql.db where user like 'mysqltest\_%'; delete from mysql.tables_priv where user like 'mysqltest\_%'; flush privileges; drop table t1, t2; +select convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone) from (select 'UTC' as custTimeZone) as tmp; +convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone) +2005-01-14 17:00:00 +create table t1 select convert_tz(NULL, NULL, NULL); +select * from t1; +convert_tz(NULL, NULL, NULL) +NULL +drop table t1; |