diff options
| author | unknown <igreenhoe/greenman@anubis.greendragongames.com> | 2006-07-13 16:35:25 -0700 |
|---|---|---|
| committer | unknown <igreenhoe/greenman@anubis.greendragongames.com> | 2006-07-13 16:35:25 -0700 |
| commit | 35bfad1e3db9d955a135035d4af6665f0331e811 (patch) | |
| tree | ade4a3fc40348d0802ec1bbd31d554eaa91edfd3 /mysql-test/t/date_formats.test | |
| parent | 316577d69537d49d359a1928c6f54194aef19620 (diff) | |
| parent | 3c2bdb59bc19a62f08e9b778649d9f12a9c87eab (diff) | |
| download | mariadb-git-35bfad1e3db9d955a135035d4af6665f0331e811.tar.gz | |
4.1 -> 5.0 merge
client/mysql.cc:
Auto merged
client/sql_string.h:
Auto merged
configure.in:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/table.cc:
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 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" |