Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:40:19 JST 2012
Kouhei Sutou 2011-10-27 18:37:12 +0900 (Thu, 27 Oct 2011) New Revision: b3e882b105f83703a40a2953c062e800bd357b39 https://github.com/mroonga/mroonga/commit/b3e882b105f83703a40a2953c062e800bd357b39 Log: disable inplace index change with MySQL 5.1. Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+4 -1) =================================================================== --- ha_mroonga.cc 2011-10-27 18:30:37 +0900 (5a2daae) +++ ha_mroonga.cc 2011-10-27 18:37:12 +0900 (ba093cd) @@ -922,7 +922,9 @@ static void mrn_store_field(grn_ctx *ctx, Field *field, grn_obj *col, grn_id id) } static uint mrn_alter_table_flags(uint flags) { - uint ret_flags = + uint ret_flags = 0; +#ifdef MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE + ret_flags |= HA_INPLACE_ADD_INDEX_NO_READ_WRITE | HA_INPLACE_DROP_INDEX_NO_READ_WRITE | HA_INPLACE_ADD_UNIQUE_INDEX_NO_READ_WRITE | @@ -935,6 +937,7 @@ static uint mrn_alter_table_flags(uint flags) { HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE | HA_INPLACE_ADD_PK_INDEX_NO_WRITE | HA_INPLACE_DROP_PK_INDEX_NO_WRITE; +#endif return ret_flags; } Modified: ha_mroonga.h (+4 -0) =================================================================== --- ha_mroonga.h 2011-10-27 18:30:37 +0900 (6249b40) +++ ha_mroonga.h 2011-10-27 18:37:12 +0900 (32c445c) @@ -57,6 +57,10 @@ extern "C" { # define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1 #endif +#if MYSQL_VERSION_ID >= 50512 +# define MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE +#endif + #if MYSQL_VERSION_ID < 50600 typedef Item COND; #endif -------------- next part -------------- HTML����������������������������...Download