Kouhei Sutou
null+****@clear*****
Wed May 8 11:58:39 JST 2013
Kouhei Sutou 2013-05-08 11:58:39 +0900 (Wed, 08 May 2013) New Revision: e5ec50b052bc7e91e2fcf7429dec61298e9f13e0 https://github.com/mroonga/mroonga/commit/e5ec50b052bc7e91e2fcf7429dec61298e9f13e0 Message: Use LL and ULL suffix directly Because MariaDB says they are "totally unnecessary". See: http://bazaar.launchpad.net/~maria-captains/maria/10.0/revision/3427.1.84 Committer: Sergei Golubchik Date: 2013-04-07 12:00:16 UTC mto: (3492.1.19 10.0-merge) (3427.18.28 maria-10.0-mwl253-merge) mto: This revision was merged to the branch mainline in revision 3727. Revision ID: sergii �� pisem.net-20130407120016-jq9c73sog6vvycuz remove ULL() and LL(), because they're totally unnecessary and sometimes harmful (used with expressions) Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+0 -6) =================================================================== --- ha_mroonga.cpp 2013-05-08 11:38:54 +0900 (3cad02d) +++ ha_mroonga.cpp 2013-05-08 11:58:39 +0900 (d387546) @@ -10164,15 +10164,9 @@ int ha_mroonga::storage_encode_key_datetime(Field *field, const uchar *key, #endif { long long int encoded_datetime = sint8korr(key); -#if MYSQL_VERSION_ID >= 100002 && defined(MRN_MARIADB_P) uint32 part1 = (uint32)(encoded_datetime / 1000000LL); uint32 part2 = (uint32)(encoded_datetime - (unsigned long long int)part1 * 1000000LL); -#else - uint32 part1 = (uint32)(encoded_datetime / LL(1000000)); - uint32 part2 = (uint32)(encoded_datetime - - (unsigned long long int)part1 * LL(1000000)); -#endif struct tm date; memset(&date, 0, sizeof(struct tm)); date.tm_year = part1 / 10000 - TM_YEAR_BASE; -------------- next part -------------- HTML����������������������������...Download
