Kouhei Sutou
null+****@clear*****
Fri Jul 21 13:44:52 JST 2017
Kouhei Sutou 2017-07-21 13:44:52 +0900 (Fri, 21 Jul 2017) New Revision: 17c3223b6a29d974ff3e72579a63b02b5ded3019 https://github.com/mroonga/mroonga/commit/17c3223b6a29d974ff3e72579a63b02b5ded3019 Message: mysql80' use compatibility macro Modified files: lib/mrn_count_skip_checker.cpp Modified: lib/mrn_count_skip_checker.cpp (+6 -6) =================================================================== --- lib/mrn_count_skip_checker.cpp 2017-07-20 23:53:02 +0900 (c74d1b7) +++ lib/mrn_count_skip_checker.cpp 2017-07-21 13:44:52 +0900 (216f3b7) @@ -84,15 +84,15 @@ namespace mrn { sum_item->sum_func()); DBUG_RETURN(false); } - if (sum_item->base_select->nest_level != 0 || - sum_item->aggr_select->nest_level != 0 || - sum_item->max_aggr_level != -1 || + if (ITEM_SUM_GET_NEST_LEVEL(sum_item) != 0 || + ITEM_SUM_GET_AGGR_LEVEL(sum_item) != 0 || + ITEM_SUM_GET_MAX_AGGR_LEVEL(sum_item) != -1 || sum_item->max_sum_func_level != -1) { GRN_LOG(ctx_, GRN_LOG_DEBUG, "[mroonga][count-skip][false] not simple COUNT(*): %d:%d:%d:%d", - sum_item->base_select->nest_level, - sum_item->aggr_select->nest_level, - sum_item->max_aggr_level, + ITEM_SUM_GET_NEST_LEVEL(sum_item), + ITEM_SUM_GET_AGGR_LEVEL(sum_item), + ITEM_SUM_GET_MAX_AGGR_LEVEL(sum_item), sum_item->max_sum_func_level); DBUG_RETURN(false); } -------------- next part -------------- HTML����������������������������...Download