Kouhei Sutou
null+****@clear*****
Sat May 16 17:52:17 JST 2015
Kouhei Sutou 2015-05-16 17:52:17 +0900 (Sat, 16 May 2015) New Revision: 7adde2d901893b34b90bd3cd29d128394eab9ad1 https://github.com/mroonga/mroonga/commit/7adde2d901893b34b90bd3cd29d128394eab9ad1 Message: mariadb10.1: follow API change of TABLE_SHARE::tdc Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+5 -1) =================================================================== --- ha_mroonga.cpp 2015-05-16 17:28:16 +0900 (67a0259) +++ ha_mroonga.cpp 2015-05-16 17:52:17 +0900 (e24c946) @@ -110,7 +110,11 @@ #define MRN_LONG_TEXT_SIZE (1 << 31) // 2Gbytes #ifdef MRN_HAVE_TDC_LOCK_TABLE_SHARE -# define mrn_open_mutex(share) &((share)->tdc.LOCK_table_share) +# ifdef MRN_TABLE_SHARE_TDC_IS_POINTER +# define mrn_open_mutex(share) &((share)->tdc->LOCK_table_share) +# else +# define mrn_open_mutex(share) &((share)->tdc.LOCK_table_share) +# endif # define mrn_open_mutex_lock(share) do { \ TABLE_SHARE *share_ = share; \ if (share_ && share_->tmp_table == NO_TMP_TABLE) { \ Modified: ha_mroonga.hpp (+3 -0) =================================================================== --- ha_mroonga.hpp 2015-05-16 17:28:16 +0900 (78d5c3d) +++ ha_mroonga.hpp 2015-05-16 17:52:17 +0900 (7b72df8) @@ -191,6 +191,9 @@ extern "C" { #if (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100010) # define MRN_HAVE_TDC_LOCK_TABLE_SHARE +# if MYSQL_VERSION_ID >= 100100 +# define MRN_TABLE_SHARE_TDC_IS_POINTER +# endif #endif #ifdef MRN_MARIADB_P -------------- next part -------------- HTML����������������������������...Download