Kouhei Sutou
null+****@clear*****
Tue Mar 17 00:04:44 JST 2015
Kouhei Sutou 2015-03-17 00:04:44 +0900 (Tue, 17 Mar 2015) New Revision: edb11b0f3674c1416646cabe003abd37d577d030 https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030 Message: mysql57: follow SELECT_LEX::non_agg_fields API change It's not the same condition. We may need to use a feature in sql/aggregate_check.h. Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+5 -1) =================================================================== --- ha_mroonga.cpp 2015-03-16 23:54:52 +0900 (c857cfa) +++ ha_mroonga.cpp 2015-03-17 00:04:44 +0900 (7e0269f) @@ -210,11 +210,15 @@ static mysql_mutex_t *mrn_LOCK_open; ((select_lex)->where_cond()) # define MRN_SELECT_LEX_GET_HAVING_COND(select_lex) \ ((select_lex)->having_cond()) +# define MRN_SELECT_LEX_IS_AGG_FUNC_USED(select_lex) \ + ((select_lex)->agg_func_used()) #else # define MRN_SELECT_LEX_GET_WHERE_COND(select_lex) \ ((select_lex)->where) # define MRN_SELECT_LEX_GET_HAVING_COND(select_lex) \ ((select_lex)->having) +# define MRN_SELECT_LEX_IS_AGG_FUNC_USED(select_lex) \ + ((select_lex)->non_agg_fields.elements) #endif Rpl_filter *mrn_binlog_filter; @@ -9212,7 +9216,7 @@ void ha_mroonga::check_count_skip(key_part_map start_key_part_map, if ( thd_sql_command(ha_thd()) == SQLCOM_SELECT && - !select_lex->non_agg_fields.elements && + !MRN_SELECT_LEX_IS_AGG_FUNC_USED(select_lex) && !select_lex->group_list.elements && !MRN_SELECT_LEX_GET_HAVING_COND(select_lex) && select_lex->table_list.elements == 1 -------------- next part -------------- HTML����������������������������...ダウンロード
