diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 11:48:30 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 11:48:30 +0200 |
commit | cc3b5d1fe75cf1d9b83b7918151f8d90e9263d34 (patch) | |
tree | 126aa92625cbe953175cefec87dbd92d97ce7a54 /sql-common/my_time.c | |
parent | b006d2ead4640f0ab4e29687fd7d24988b1c98f1 (diff) | |
parent | 22770a9f9a7fb4c30dbdc204e5a8f829303b7373 (diff) | |
download | mariadb-git-cc3b5d1fe75cf1d9b83b7918151f8d90e9263d34.tar.gz |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql-common/my_time.c')
-rw-r--r-- | sql-common/my_time.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index eac02581f0d..c4731d6b601 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -1426,31 +1426,3 @@ double TIME_to_double(const MYSQL_TIME *my_time) d+= my_time->second_part/(double)TIME_SECOND_PART_FACTOR; return my_time->neg ? -d : d; } - -longlong pack_time(const MYSQL_TIME *my_time) -{ - return ((((((my_time->year * 13ULL + - my_time->month) * 32ULL + - my_time->day) * 24ULL + - my_time->hour) * 60ULL + - my_time->minute) * 60ULL + - my_time->second) * 1000000ULL + - my_time->second_part) * (my_time->neg ? -1 : 1); -} - -#define get_one(WHERE, FACTOR) WHERE= (ulong)(packed % FACTOR); packed/= FACTOR - -MYSQL_TIME *unpack_time(longlong packed, MYSQL_TIME *my_time) -{ - if ((my_time->neg= packed < 0)) - packed= -packed; - get_one(my_time->second_part, 1000000ULL); - get_one(my_time->second, 60U); - get_one(my_time->minute, 60U); - get_one(my_time->hour, 24U); - get_one(my_time->day, 32U); - get_one(my_time->month, 13U); - my_time->year= (uint)packed; - my_time->time_type= MYSQL_TIMESTAMP_DATETIME; - return my_time; -} |