diff options
| author | unknown <joreland@mysql.com> | 2004-08-10 17:42:51 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-10 17:42:51 +0200 |
| commit | e9a4ea902ab907851006d6a6ddd555daea87943c (patch) | |
| tree | 8bc7c9c4deaaf9a6f51f974c61e75ba60fbb759a /mysql-test | |
| parent | c90e9620212f467592b1aa31d2b16fdc70a42a83 (diff) | |
| parent | ec5c569103aca010816834426b9f56752f33a1c1 (diff) | |
| download | mariadb-git-e9a4ea902ab907851006d6a6ddd555daea87943c.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/timezone2.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/timezone2.test | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result index 5361ff4ffe6..02406b77a65 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -244,3 +244,10 @@ NULL select convert_tz( NULL, 'MET', 'UTC'); convert_tz( NULL, 'MET', 'UTC') NULL +create table t1 (ts timestamp); +set timestamp=1000000000; +insert into t1 (ts) values (now()); +select convert_tz(ts, @@time_zone, 'Japan') from t1; +convert_tz(ts, @@time_zone, 'Japan') +2001-09-09 10:46:40 +drop table t1; diff --git a/mysql-test/t/timezone2.test b/mysql-test/t/timezone2.test index 49579421570..15ac3416b29 100644 --- a/mysql-test/t/timezone2.test +++ b/mysql-test/t/timezone2.test @@ -187,3 +187,15 @@ select convert_tz('2003-12-31 04:00:00', 'SomeNotExistingTimeZone', 'UTC'); select convert_tz('2003-12-31 04:00:00', 'MET', 'SomeNotExistingTimeZone'); select convert_tz('2003-12-31 04:00:00', 'MET', NULL); select convert_tz( NULL, 'MET', 'UTC'); + +# +# Test for bug #4508 "CONVERT_TZ() function with new time zone as param +# crashes server." (Was caused by improperly worked mechanism of time zone +# dynamical loading). +# +create table t1 (ts timestamp); +set timestamp=1000000000; +insert into t1 (ts) values (now()); +select convert_tz(ts, @@time_zone, 'Japan') from t1; +drop table t1; + |