summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
diff options
context:
space:
mode:
authorjani@ua141d10.elisa.omakaista.fi <>2006-05-04 20:19:37 +0300
committerjani@ua141d10.elisa.omakaista.fi <>2006-05-04 20:19:37 +0300
commit06d6b7472be3eb2a37719018349829daef672acd (patch)
treeda2de9e070f828742e41142cd7ecdb3c67fffe2c /sql/item_timefunc.cc
parent526e1a70e2dd6b53f879cb6bad18698b76ca38bd (diff)
downloadmariadb-git-06d6b7472be3eb2a37719018349829daef672acd.tar.gz
Fixed Bug#11324:
TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r--sql/item_timefunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index f26b5aae37a..670fb94fc2c 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -609,7 +609,7 @@ bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time,
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;