diff options
| author | unknown <evgen@moonbone.local> | 2006-07-18 21:32:25 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-18 21:32:25 +0400 |
| commit | ec40f4a588faa4b759816fd619929088b0723c24 (patch) | |
| tree | 936ba28a1ea1b3a74a7153b6f9de37b6fcc475ef /mysql-test/t/date_formats.test | |
| parent | 769280a460e85b4ed829de9209e74222872d390a (diff) | |
| parent | 5a77e566abb4c486a296c1ad762ddfe740db695e (diff) | |
| download | mariadb-git-ec40f4a588faa4b759816fd619929088b0723c24.tar.gz | |
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/time.cc:
Manual merge
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 21c228145ac..a81487d273d 100644 --- a/mysql-test/t/date_formats.test +++ b/mysql-test/t/date_formats.test @@ -290,7 +290,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 @@ -321,3 +320,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" |