Kouhei Sutou
null+****@clear*****
Mon Aug 26 17:32:06 JST 2013
Kouhei Sutou 2013-08-26 17:32:06 +0900 (Mon, 26 Aug 2013) New Revision: 81c7db4f390e172b30344ca28e1d7c56f85c0034 https://github.com/mroonga/mroonga/commit/81c7db4f390e172b30344ca28e1d7c56f85c0034 Message: Define MRN_HAVE_ALTER_INFO and use it Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+1 -1) =================================================================== --- ha_mroonga.cpp 2013-08-26 17:24:49 +0900 (28d52cb) +++ ha_mroonga.cpp 2013-08-26 17:32:06 +0900 (dcec69f) @@ -1330,7 +1330,7 @@ static void mrn_grn_time_to_mysql_time(long long int grn_time, static uint mrn_alter_table_flags(uint flags) { uint ret_flags = 0; #ifdef HA_INPLACE_ADD_INDEX_NO_READ_WRITE -#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100004 +#ifdef MRN_HAVE_ALTER_INFO if (((flags & Alter_info::ALTER_ADD_INDEX) && (flags & Alter_info::ALTER_DROP_INDEX)) || (flags & Alter_info::ALTER_CHANGE_COLUMN)) Modified: mrn_mysql_compat.h (+4 -0) =================================================================== --- mrn_mysql_compat.h 2013-08-26 17:24:49 +0900 (191e6ab) +++ mrn_mysql_compat.h 2013-08-26 17:32:06 +0900 (b802aac) @@ -106,4 +106,8 @@ # define MRN_HAVE_TDC_ACQUIRE_SHARE #endif +#if MYSQL_VERSION_ID >= 50613 +# define MRN_HAVE_ALTER_INFO +#endif + #endif /* MRN_MYSQL_COMPAT_H_ */ -------------- next part -------------- HTML����������������������������...下載
