summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-11-07 00:09:18 +0200
committerunknown <monty@hundin.mysql.fi>2001-11-07 00:09:18 +0200
commit3c0487c4c31c516c745a020f2c1b2e836cb28d86 (patch)
tree627aa007fc87aa6ed8682dde3ed74c682cafbd65 /sql
parent7999a08c8af3b88900faa5723958305a9d70bebd (diff)
parentf271c8145dae6fb3b8518919f5b6773648083fa0 (diff)
downloadmariadb-git-3c0487c4c31c516c745a020f2c1b2e836cb28d86.tar.gz
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Diffstat (limited to 'sql')
-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 a8bd219eef1..b198900d24e 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -525,7 +525,7 @@ String *Item_func_sec_to_time::val_str(String *str)
seconds= -seconds;
sign= "-";
}
- uint sec= (uint) (seconds % 3600);
+ uint sec= (uint) ((ulonglong) seconds % 3600);
sprintf(buff,"%s%02lu:%02u:%02u",sign,(long) (seconds/3600),
sec/60, sec % 60);
str->copy(buff,(uint) strlen(buff));