Kouhei Sutou
null+****@clear*****
Mon Aug 26 17:47:15 JST 2013
Kouhei Sutou 2013-08-26 17:47:15 +0900 (Mon, 26 Aug 2013) New Revision: eec453c60ea725e4aee267f42e03a0290770586b https://github.com/mroonga/mroonga/commit/eec453c60ea725e4aee267f42e03a0290770586b Message: Extract condition from ifdef Because it breaks "if" style. Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+8 -6) =================================================================== --- ha_mroonga.cpp 2013-08-26 17:40:03 +0900 (ed7991c) +++ ha_mroonga.cpp 2013-08-26 17:47:15 +0900 (080262b) @@ -1330,15 +1330,17 @@ static void mrn_grn_time_to_mysql_time(long long int grn_time, static uint mrn_alter_table_flags(uint flags) { uint alter_flags = 0; #ifdef HA_INPLACE_ADD_INDEX_NO_READ_WRITE + bool is_change_index; # ifdef MRN_HAVE_ALTER_INFO - if (((flags & Alter_info::ALTER_ADD_INDEX) && - (flags & Alter_info::ALTER_DROP_INDEX)) || - (flags & Alter_info::ALTER_CHANGE_COLUMN)) + is_change_index = (((flags & Alter_info::ALTER_ADD_INDEX) && + (flags & Alter_info::ALTER_DROP_INDEX)) || + (flags & Alter_info::ALTER_CHANGE_COLUMN)); # else - if (((flags & ALTER_ADD_INDEX) && (flags & ALTER_DROP_INDEX)) || - (flags & ALTER_CHANGE_COLUMN)) + is_change_index = (((flags & ALTER_ADD_INDEX) && + (flags & ALTER_DROP_INDEX)) || + (flags & ALTER_CHANGE_COLUMN)); # endif - { + if (is_change_index) { // Adding/dropping an index at once and changing an index aren't supported. alter_flags |= 0; } else { -------------- next part -------------- HTML����������������������������...Download