Kouhei Sutou
null+****@clear*****
Fri Aug 9 17:15:08 JST 2013
Kouhei Sutou 2013-08-09 17:15:08 +0900 (Fri, 09 Aug 2013) New Revision: 12c2cdf1273a023ce27bbb827be2e70375e31633 https://github.com/mroonga/mroonga/commit/12c2cdf1273a023ce27bbb827be2e70375e31633 Message: Move MRN_GET_ERROR_MESSAGE to compatibility header Modified files: ha_mroonga.hpp mrn_mysql_compat.h Modified: ha_mroonga.hpp (+0 -10) =================================================================== --- ha_mroonga.hpp 2013-08-09 17:05:22 +0900 (c8147d4) +++ ha_mroonga.hpp 2013-08-09 17:15:08 +0900 (d6760ac) @@ -164,16 +164,6 @@ extern "C" { # define MRN_HAVE_HA_REBIND_PSI #endif -#if MYSQL_VERSION_ID >= 50607 -# define MRN_GET_ERROR_MESSAGE current_thd->get_stmt_da()->message() -#else -# if MYSQL_VERSION_ID >= 50500 -# define MRN_GET_ERROR_MESSAGE current_thd->stmt_da->message() -# else -# define MRN_GET_ERROR_MESSAGE current_thd->main_da.message() -# endif -#endif - #if MYSQL_VERSION_ID >= 50612 && !defined(MRN_MARIADB_P) # define MRN_HAVE_POINT_XY #endif Modified: mrn_mysql_compat.h (+10 -0) =================================================================== --- mrn_mysql_compat.h 2013-08-09 17:05:22 +0900 (5c7fd28) +++ mrn_mysql_compat.h 2013-08-09 17:15:08 +0900 (79d4f47) @@ -83,4 +83,14 @@ # define FN_LIBCHAR2 FN_LIBCHAR #endif +#if MYSQL_VERSION_ID >= 50607 +# define MRN_GET_ERROR_MESSAGE current_thd->get_stmt_da()->message() +#else +# if MYSQL_VERSION_ID >= 50500 +# define MRN_GET_ERROR_MESSAGE current_thd->stmt_da->message() +# else +# define MRN_GET_ERROR_MESSAGE current_thd->main_da.message() +# endif +#endif + #endif /* MRN_MYSQL_COMPAT_H_ */ -------------- next part -------------- HTML����������������������������...Download