Kouhei Sutou
null+****@clear*****
Tue Apr 19 17:22:07 JST 2016
Kouhei Sutou 2016-04-19 17:22:07 +0900 (Tue, 19 Apr 2016) New Revision: 4c9f91223bb09dd27d124babf850d5cf74705881 https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881 Message: mariadb10.2: follow ORDER::direction API change Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+11 -3) =================================================================== --- ha_mroonga.cpp 2016-04-19 16:59:54 +0900 (465721b) +++ ha_mroonga.cpp 2016-04-19 17:22:07 +0900 (e7f0f77) @@ -145,10 +145,18 @@ static mysql_mutex_t *mrn_LOCK_open; # define MRN_NEED_M_LOCK_TYPE_CHECK_FOR_WRAPPER_EXTERNAL_LOCK #endif -#if MYSQL_VERSION_ID >= 50603 && !defined(MRN_MARIADB_P) -# define MRN_ORDER_IS_ASC(order) ((order)->direction == ORDER::ORDER_ASC) +#ifdef MRN_MARIADB_P +# if MYSQL_VERSION_ID >= 100200 +# define MRN_ORDER_IS_ASC(order) ((order)->direction == ORDER::ORDER_ASC) +# else +# define MRN_ORDER_IS_ASC(order) ((order)->asc) +# endif #else -# define MRN_ORDER_IS_ASC(order) ((order)->asc) +# if MYSQL_VERSION_ID >= 50603 +# define MRN_ORDER_IS_ASC(order) ((order)->direction == ORDER::ORDER_ASC) +# else +# define MRN_ORDER_IS_ASC(order) ((order)->asc) +# endif #endif #define MRN_STRINGIFY(macro_or_string) MRN_STRINGIFY_ARG(macro_or_string) -------------- next part -------------- HTML����������������������������...Download