diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-11 14:25:42 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-11 14:25:42 -0400 |
| commit | 26ddd5cb0c2f93f39f05f89b642642fb2c79f5d0 (patch) | |
| tree | a0ca851c164dde7e6c6f20c2aec3d04aee0cbf3b /mysql-test/t/date_formats.test | |
| parent | 665db1a6ade28cc7c6152a7411badbc822792331 (diff) | |
| parent | ed001f18a49301f51cab3e3e5d5c9ade212bd19f (diff) | |
| download | mariadb-git-26ddd5cb0c2f93f39f05f89b642642fb2c79f5d0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
Diffstat (limited to 'mysql-test/t/date_formats.test')
| -rw-r--r-- | mysql-test/t/date_formats.test | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test index 362f4614464..922d047eac8 100644 --- a/mysql-test/t/date_formats.test +++ b/mysql-test/t/date_formats.test @@ -289,7 +289,6 @@ drop table t1; 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 @@ -312,3 +311,10 @@ 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'); + +# +# Bug#20729: Bad date_format() call makes mysql server crash +# +SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896); + +--echo "End of 4.1 tests" |