Commit 5f173c30 authored by unknown's avatar unknown
Browse files

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
parents 43876431 d1bd5eeb

mysql-test/r/date_formats.result

+36 −0
Original line number Diff line number Diff line
@@ -512,3 +512,39 @@ NULL 
select str_to_date( 1, IF(1=1,NULL,NULL) );

str_to_date( 1, IF(1=1,NULL,NULL) )

NULL

SELECT TIME_FORMAT("24:00:00", '%r');

TIME_FORMAT("24:00:00", '%r')

12:00:00 AM

SELECT TIME_FORMAT("00:00:00", '%r');

TIME_FORMAT("00:00:00", '%r')

12:00:00 AM

SELECT TIME_FORMAT("12:00:00", '%r');

TIME_FORMAT("12:00:00", '%r')

12:00:00 PM

SELECT TIME_FORMAT("15:00:00", '%r');

TIME_FORMAT("15:00:00", '%r')

03:00:00 PM

SELECT TIME_FORMAT("01:00:00", '%r');

TIME_FORMAT("01:00:00", '%r')

01:00:00 AM

SELECT TIME_FORMAT("25:00:00", '%r');

TIME_FORMAT("25:00:00", '%r')

01:00:00 AM

SELECT TIME_FORMAT("00:00:00", '%l %p');

TIME_FORMAT("00:00:00", '%l %p')

12 AM

SELECT TIME_FORMAT("01:00:00", '%l %p');

TIME_FORMAT("01:00:00", '%l %p')

1 AM

SELECT TIME_FORMAT("12:00:00", '%l %p');

TIME_FORMAT("12:00:00", '%l %p')

12 PM

SELECT TIME_FORMAT("23:00:00", '%l %p');

TIME_FORMAT("23:00:00", '%l %p')

11 PM

SELECT TIME_FORMAT("24:00:00", '%l %p');

TIME_FORMAT("24:00:00", '%l %p')

12 AM

SELECT TIME_FORMAT("25:00:00", '%l %p');

TIME_FORMAT("25:00:00", '%l %p')

1 AM

mysql-test/t/date_formats.test

+22 −0
Original line number Diff line number Diff line
@@ -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');

sql/item_timefunc.cc

+2 −1
Original line number Diff line number Diff line
@@ -631,7 +631,8 @@ bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time, 
      case 'r':

	length= my_sprintf(intbuff, 

		   (intbuff, 

		    (l_time->hour < 12) ? "%02d:%02d:%02d AM" : "%02d:%02d:%02d PM",

		    ((l_time->hour % 24) < 12) ?

                    "%02d:%02d:%02d AM" : "%02d:%02d:%02d PM",

		    (l_time->hour+11)%12+1,

		    l_time->minute,

		    l_time->second));