diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 14:00:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 14:00:16 +0200 |
| commit | 4ec6fe10e56de0cf9b4dbc649b8552ae39c2c500 (patch) | |
| tree | fbc0352dd0f6bf00d934e96e6b3af99a1cfe0b2c /sql/sql_time.cc | |
| parent | ef5241ae05b0f1bdf3668b4f0876bf0b4fe309a0 (diff) | |
| download | mariadb-git-4ec6fe10e56de0cf9b4dbc649b8552ae39c2c500.tar.gz | |
remove ULL() and LL(), because they're totally unnecessary
and sometimes harmful (used with expressions)
Diffstat (limited to 'sql/sql_time.cc')
| -rw-r--r-- | sql/sql_time.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index dadf579b2e7..89c2e3b7086 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -1017,13 +1017,13 @@ calc_time_diff(MYSQL_TIME *l_time1, MYSQL_TIME *l_time2, int l_sign, longlong *s (uint) l_time2->day); } - microseconds= ((longlong)days*LL(86400) + + microseconds= ((longlong)days*86400LL + (longlong)(l_time1->hour*3600L + l_time1->minute*60L + l_time1->second) - l_sign*(longlong)(l_time2->hour*3600L + l_time2->minute*60L + - l_time2->second)) * LL(1000000) + + l_time2->second)) * 1000000LL + (longlong)l_time1->second_part - l_sign*(longlong)l_time2->second_part; |