Kouhei Sutou 2019-05-18 22:59:50 +0900 (Sat, 18 May 2019) Revision: 5427c23e0af0a728f2f369e7fae63ef44cd1bb9c https://github.com/mroonga/mroonga/commit/5427c23e0af0a728f2f369e7fae63ef44cd1bb9c Message: mysql8: follow TIME_to_longlong_datetime_packed() signature change Modified files: lib/mrn_multiple_column_key_codec.cpp mrn_mysql_compat.h Modified: lib/mrn_multiple_column_key_codec.cpp (+2 -2) =================================================================== --- lib/mrn_multiple_column_key_codec.cpp 2019-05-18 22:55:54 +0900 (88b76cf2) +++ lib/mrn_multiple_column_key_codec.cpp 2019-05-18 22:59:50 +0900 (e0d07809) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2012-2018 Kouhei Sutou <kou****@clear*****> + Copyright(C) 2012-2019 Kouhei Sutou <kou****@clear*****> Copyright(C) 2013 Kentoku SHIBA This library is free software; you can redistribute it and/or @@ -309,7 +309,7 @@ namespace mrn { mysql_time.time_type = MYSQL_TIMESTAMP_DATETIME; time_converter.grn_time_to_mysql_time(grn_time, &mysql_time); long long int mysql_datetime_packed = - TIME_to_longlong_datetime_packed(&mysql_time); + mrn_TIME_to_longlong_datetime_packed(mysql_time); my_datetime_packed_to_binary(mysql_datetime_packed, current_mysql_key, datetimef_field->decimals()); Modified: mrn_mysql_compat.h (+9 -1) =================================================================== --- mrn_mysql_compat.h 2019-05-18 22:55:54 +0900 (4b1e3261) +++ mrn_mysql_compat.h 2019-05-18 22:59:50 +0900 (9fd6b8a7) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2011-2018 Kouhei Sutou <kou****@clear*****> + Copyright(C) 2011-2019 Kouhei Sutou <kou****@clear*****> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -763,3 +763,11 @@ typedef HASH mrn_table_def_cache_type; # define mrn_alloc_table_share(table_list, key, key_length) \ alloc_table_share((table_list), (key), (key_length)) #endif + +#if (MYSQL_VERSION_ID >= 80016 && !defined(MRN_MARIADB_P)) +# define mrn_TIME_to_longlong_datetime_packed(mysql_time) \ + TIME_to_longlong_datetime_packed(mysql_time) +#else +# define mrn_TIME_to_longlong_datetime_packed(mysql_time) \ + TIME_to_longlong_datetime_packed(&mysql_time) +#endif -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20190518/ced6ab37/attachment-0001.html>
