diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-17 05:57:21 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-17 05:57:21 +0100 |
| commit | 8309c197faab8b6c49e26082f5e24ee38ae834b2 (patch) | |
| tree | 97fb75ac3b33df4f54bb08644cfeb1466618ba2f /mysql-test/r | |
| parent | 9a0020b5c41977df46d83baaa3f03b53ea87412b (diff) | |
| parent | 5e9933d7ff7d7fdd0e8b117b0344b127d5f23ffa (diff) | |
| download | mariadb-git-8309c197faab8b6c49e26082f5e24ee38ae834b2.tar.gz | |
Merge mysql.com:/misc/mysql/mysql-5.0-opt
into mysql.com:/misc/mysql/32180/50-32180
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_time.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 74859be4d04..71234385c0d 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1270,4 +1270,16 @@ select concat(a,ifnull(min(date_format(now(), '%Y-%m-%d')),' ull')) from t1; ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (latin1_swedish_ci,COERCIBLE) for operation 'concat' set lc_time_names=en_US; drop table t1; +select DATE_ADD('20071108181000', INTERVAL 1 DAY); +DATE_ADD('20071108181000', INTERVAL 1 DAY) +2007-11-09 18:10:00 +select DATE_ADD(20071108181000, INTERVAL 1 DAY); +DATE_ADD(20071108181000, INTERVAL 1 DAY) +2007-11-09 18:10:00 +select DATE_ADD('20071108', INTERVAL 1 DAY); +DATE_ADD('20071108', INTERVAL 1 DAY) +2007-11-09 +select DATE_ADD(20071108, INTERVAL 1 DAY); +DATE_ADD(20071108, INTERVAL 1 DAY) +2007-11-09 End of 5.0 tests |