diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-05-05 00:22:01 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-05-05 00:22:01 +0300 |
| commit | 5f173c302e3c2758277337dd2bbf3b6a46536e0d (patch) | |
| tree | 373a4012ff8028b6dd93a85209bb8fb5525d7705 /mysql-test/t/date_formats.test | |
| parent | 43876431f7b146de6c3b6f289abe3c8660b1abb6 (diff) | |
| parent | d1bd5eeb4717f7e586a773a04b3a322395556d35 (diff) | |
| download | mariadb-git-5f173c302e3c2758277337dd2bbf3b6a46536e0d.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_timefunc.cc:
Merged from 4.1
Diffstat (limited to 'mysql-test/t/date_formats.test')
| -rw-r--r-- | mysql-test/t/date_formats.test | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test index b4c6cf0d72a..94a192e12f2 100644 --- a/mysql-test/t/date_formats.test +++ b/mysql-test/t/date_formats.test @@ -277,3 +277,25 @@ select str_to_date( 1, NULL ); select str_to_date( NULL, 1 ); select str_to_date( 1, IF(1=1,NULL,NULL) ); # End of 4.1 tests + +# +# Bug#11326 +# + +SELECT TIME_FORMAT("24:00:00", '%r'); +SELECT TIME_FORMAT("00:00:00", '%r'); +SELECT TIME_FORMAT("12:00:00", '%r'); +SELECT TIME_FORMAT("15:00:00", '%r'); +SELECT TIME_FORMAT("01:00:00", '%r'); +SELECT TIME_FORMAT("25:00:00", '%r'); + +# +# Bug#11324 +# + +SELECT TIME_FORMAT("00:00:00", '%l %p'); +SELECT TIME_FORMAT("01:00:00", '%l %p'); +SELECT TIME_FORMAT("12:00:00", '%l %p'); +SELECT TIME_FORMAT("23:00:00", '%l %p'); +SELECT TIME_FORMAT("24:00:00", '%l %p'); +SELECT TIME_FORMAT("25:00:00", '%l %p'); |