diff options
author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:30:03 +0300 |
---|---|---|
committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:30:03 +0300 |
commit | db0cfba638383569b1e30765e2d36e0707bfb930 (patch) | |
tree | d56bf3ec5c5804b2bd15a5eceddb14b5520b3d2e /sql/protocol.cc | |
parent | 0a9216835f406947fb4d492616da4cda75e5e113 (diff) | |
parent | a057b504904c3e6ab1e3006c081b4fb23faaf1d4 (diff) | |
download | mariadb-git-db0cfba638383569b1e30765e2d36e0707bfb930.tar.gz |
Merged with lp:maria revision #3766
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r-- | sql/protocol.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index a86da94af61..d46365df0ad 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -1435,7 +1435,7 @@ bool Protocol_binary::store(MYSQL_TIME *tm, int decimals) DBUG_ASSERT(decimals == AUTO_SEC_PART_DIGITS || (decimals >= 0 && decimals <= TIME_SECOND_PART_DIGITS)); if (decimals != AUTO_SEC_PART_DIGITS) - tm->second_part= sec_part_truncate(tm->second_part, decimals); + my_time_trunc(tm, decimals); int4store(pos+7, tm->second_part); if (tm->second_part) length=11; @@ -1477,7 +1477,7 @@ bool Protocol_binary::store_time(MYSQL_TIME *tm, int decimals) DBUG_ASSERT(decimals == AUTO_SEC_PART_DIGITS || (decimals >= 0 && decimals <= TIME_SECOND_PART_DIGITS)); if (decimals != AUTO_SEC_PART_DIGITS) - tm->second_part= sec_part_truncate(tm->second_part, decimals); + my_time_trunc(tm, decimals); int4store(pos+8, tm->second_part); if (tm->second_part) length=12; |