Kouhei Sutou
null+****@clear*****
Tue Jun 4 16:05:02 JST 2013
Kouhei Sutou 2013-06-04 16:05:02 +0900 (Tue, 04 Jun 2013) New Revision: 3bb88489aa20046f6b499b3476cdf8820616d5b5 https://github.com/mroonga/mroonga/commit/3bb88489aa20046f6b499b3476cdf8820616d5b5 Message: Support MySQL 5.6.12 Reported by WING. Thanks!!! Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+7 -0) =================================================================== --- ha_mroonga.cpp 2013-06-04 15:33:56 +0900 (29cf83a) +++ ha_mroonga.cpp 2013-06-04 16:05:02 +0900 (61f6a69) @@ -1463,7 +1463,14 @@ static int mrn_set_geometry(grn_ctx *ctx, grn_obj *buf, { Gis_point *point = (Gis_point *)geometry; double latitude = 0.0, longitude = 0.0; +#ifdef MRN_HAVE_POINT_XY + point_xy xy; + point->get_xy(&xy); + longitude = xy.x; + latitude = xy.y; +#else point->get_xy(&longitude, &latitude); +#endif grn_obj_reinit(ctx, buf, GRN_DB_WGS84_GEO_POINT, 0); GRN_GEO_POINT_SET(ctx, buf, GRN_GEO_DEGREE2MSEC(latitude), Modified: ha_mroonga.hpp (+4 -0) =================================================================== --- ha_mroonga.hpp 2013-06-04 15:33:56 +0900 (e61391b) +++ ha_mroonga.hpp 2013-06-04 16:05:02 +0900 (88d47a0) @@ -174,6 +174,10 @@ extern "C" { # endif #endif +#if MYSQL_VERSION_ID >= 50612 && !defined(MRN_MARIADB_P) +# define MRN_HAVE_POINT_XY +#endif + #if defined(_WIN32) || defined(_WIN64) # define MRN_API __declspec(dllexport) #else -------------- next part -------------- HTML����������������������������...Descargar
