Kouhei Sutou
null+****@clear*****
Mon Mar 16 23:47:20 JST 2015
Kouhei Sutou 2015-03-16 23:47:20 +0900 (Mon, 16 Mar 2015) New Revision: c741df995aae4f028dc03fd8039efe160698b71f https://github.com/mroonga/mroonga/commit/c741df995aae4f028dc03fd8039efe160698b71f Message: mysql57: follow SELECT_LEX::having API change Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+7 -3) =================================================================== --- ha_mroonga.cpp 2015-03-16 23:43:50 +0900 (ce1124a) +++ ha_mroonga.cpp 2015-03-16 23:47:20 +0900 (c857cfa) @@ -207,10 +207,14 @@ static mysql_mutex_t *mrn_LOCK_open; #if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) # define MRN_SELECT_LEX_GET_WHERE_COND(select_lex) \ - (select_lex)->where_cond() + ((select_lex)->where_cond()) +# define MRN_SELECT_LEX_GET_HAVING_COND(select_lex) \ + ((select_lex)->having_cond()) #else # define MRN_SELECT_LEX_GET_WHERE_COND(select_lex) \ - (select_lex)->where + ((select_lex)->where) +# define MRN_SELECT_LEX_GET_HAVING_COND(select_lex) \ + ((select_lex)->having) #endif Rpl_filter *mrn_binlog_filter; @@ -9210,7 +9214,7 @@ void ha_mroonga::check_count_skip(key_part_map start_key_part_map, thd_sql_command(ha_thd()) == SQLCOM_SELECT && !select_lex->non_agg_fields.elements && !select_lex->group_list.elements && - !select_lex->having && + !MRN_SELECT_LEX_GET_HAVING_COND(select_lex) && select_lex->table_list.elements == 1 ) { Item *info = (Item *) select_lex->item_list.first_node()->info; -------------- next part -------------- HTML����������������������������...Download