diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-06 11:10:08 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-06 11:10:08 +0400 |
| commit | 4eeef03c4c6683c5a8e9b30ded1ad8576a83bba1 (patch) | |
| tree | 2116e7b1ac8f88ec7e01e57470d2c65c1a8385a4 /mysql-test/r | |
| parent | 0e69c252a17e6b5753079bc6313f2b7ac6fe1e66 (diff) | |
| parent | bec1973eee55af5b681ad737e6edfb7543faff6d (diff) | |
| download | mariadb-git-4eeef03c4c6683c5a8e9b30ded1ad8576a83bba1.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/19491/my50-19491
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/type_datetime.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/type_newdecimal.result | 8 |
2 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result index 49e4827cb97..7fc1c4f398d 100644 --- a/mysql-test/r/type_datetime.result +++ b/mysql-test/r/type_datetime.result @@ -179,3 +179,15 @@ a 2006-06-06 15:55:55 DROP PREPARE s; DROP TABLE t1; +SELECT CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6)); +CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6)) +20060810.000000 +SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME) AS DECIMAL(20,6)); +CAST(CAST('2006-08-10 10:11:12' AS DATETIME) AS DECIMAL(20,6)) +20060810101112.000000 +SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6)); +CAST(CAST('2006-08-10 10:11:12' AS DATETIME) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6)) +20060810101112.000014 +SELECT CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6)); +CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6)) +101112.098700 diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result index 33f1ece0390..23e6f8266e9 100644 --- a/mysql-test/r/type_newdecimal.result +++ b/mysql-test/r/type_newdecimal.result @@ -1412,3 +1412,11 @@ i2 count(distinct j) 1.0 2 2.0 2 drop table t1; +create table t1(f1 decimal(20,6)); +insert into t1 values (CAST('10:11:12' AS date) + interval 14 microsecond); +insert into t1 values (CAST('10:11:12' AS time)); +select * from t1; +f1 +20101112000000.000014 +101112.000000 +drop table t1; |