database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge moonbone.local:/work/mysql-4.1

Browse Source 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
This commit is contained in:
evgen@moonbone.local
2006-07-18 21:30:26 +04:00
parent f04ea13511 4be51e1644
commit a8d230c672
6 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/t/date_formats.test
View File

@@ -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"