diff options
| author | msvensson@pilot.blaudden <> | 2007-03-01 14:53:32 +0100 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-03-01 14:53:32 +0100 |
| commit | 51a71fb667e24fd3acdf950a6ac8fab7d1af8226 (patch) | |
| tree | 33c5bed5605f87c9b98fa1a2b05c7fb3f1a63415 /sql/tztime.cc | |
| parent | 6b4a71659e474fa75b4a8019d86e63eb22eb226c (diff) | |
| parent | 2baf35b4fab1cd1c185b7b98645eb76ed88d9f73 (diff) | |
| download | mariadb-git-51a71fb667e24fd3acdf950a6ac8fab7d1af8226.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index c9518bc1ece..914c7be46de 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -546,8 +546,8 @@ sec_to_TIME(TIME * tmp, my_time_t t, long offset) int yleap; const uint *ip; - days= t / SECS_PER_DAY; - rem= t % SECS_PER_DAY; + days= (long) (t / SECS_PER_DAY); + rem= (long) (t % SECS_PER_DAY); /* We do this as separate step after dividing t, because this |