bk commit into 4.1 tree (ramil:1.2472)

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2472 06/05/10 13:27:48 ramil@stripped +1 -0
  Merge rkalimullin@stripped:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/ram/work/4.1.b18501

  sql/item_timefunc.cc
    1.100 06/05/10 13:27:43 ramil@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/4.1.b18501/RESYNC

--- 1.99/sql/item_timefunc.cc	2006-04-25 14:34:14 +05:00
+++ 1.100/sql/item_timefunc.cc	2006-05-10 13:27:43 +05:00
@@ -609,7 +609,7 @@ bool make_date_time(DATE_TIME_FORMAT *fo
 	break;
       case 'l':
 	days_i= l_time->hour/24;
-	hours_i= (l_time->hour%24 + 11)%12+1 + 24*days_i;
+	hours_i= (l_time->hour%24 + 11)%12+1;
 	length= int10_to_str(hours_i, intbuff, 10) - intbuff;
 	str->append_with_prefill(intbuff, length, 1, '0');
 	break;
@@ -620,7 +620,8 @@ bool make_date_time(DATE_TIME_FORMAT *fo
       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));