bk commit into 4.1 tree (hartmut:1.2499) BUG#11326

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
4.1 repository of hartmut. When hartmut 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.2499 06/04/10 19:17:29 hartmut@stripped +1 -0
  make TIME_FORMAT(%r) behave like (%p) already does -> report AM on 24:00:00, not PM (Bug #11326)

  sql/item_timefunc.cc
    1.98 06/04/10 19:17:24 hartmut@stripped +1 -1
    make TIME_FORMAT(%r) behave like (%p) already does -> report AM on 24:00:00, not PM (Bug #11326)

# 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:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/4.1

--- 1.97/sql/item_timefunc.cc	2006-01-16 15:44:53 +01:00
+++ 1.98/sql/item_timefunc.cc	2006-04-10 19:17:24 +02:00
@@ -620,7 +620,7 @@
       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));