Kouhei Sutou
null+****@clear*****
Mon Aug 26 17:24:49 JST 2013
Kouhei Sutou 2013-08-26 17:24:49 +0900 (Mon, 26 Aug 2013) New Revision: 7c5dd89c76e682a240c92ef48c0c734cc128946e https://github.com/mroonga/mroonga/commit/7c5dd89c76e682a240c92ef48c0c734cc128946e Message: Define MRN_HAVE_TDC_ACQUIRE_SHARE and use it Modified files: mrn_mysql_compat.h mrn_table.cpp Modified: mrn_mysql_compat.h (+4 -0) =================================================================== --- mrn_mysql_compat.h 2013-08-26 17:16:47 +0900 (671234b) +++ mrn_mysql_compat.h 2013-08-26 17:24:49 +0900 (191e6ab) @@ -102,4 +102,8 @@ # define MRN_HAVE_TABLE_DEF_CACHE #endif +#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100004 +# define MRN_HAVE_TDC_ACQUIRE_SHARE +#endif + #endif /* MRN_MYSQL_COMPAT_H_ */ Modified: mrn_table.cpp (+1 -1) =================================================================== --- mrn_table.cpp 2013-08-26 17:16:47 +0900 (9d45762) +++ mrn_table.cpp 2013-08-26 17:24:49 +0900 (1bd9e3a) @@ -933,7 +933,7 @@ TABLE_SHARE *mrn_get_table_share(TABLE_LIST *table_list, int *error) hash_value = my_calc_hash(mrn_table_def_cache, (uchar*) key, key_length); share = get_table_share(thd, table_list, key, key_length, 0, error, hash_value); -#elif MYSQL_VERSION_ID >= 100004 && defined(MRN_MARIADB_P) +#elif defined(MRN_HAVE_TDC_ACQUIRE_SHARE) share = tdc_acquire_share(thd, table_list->db, table_list->table_name, key, key_length, GTS_TABLE, NULL); #else -------------- next part -------------- HTML����������������������������...Download