Kouhei Sutou
null+****@clear*****
Mon Mar 16 23:43:50 JST 2015
Kouhei Sutou 2015-03-16 23:43:50 +0900 (Mon, 16 Mar 2015) New Revision: f7e159952ba94a892834985536bf4a5ccc834957 https://github.com/mroonga/mroonga/commit/f7e159952ba94a892834985536bf4a5ccc834957 Message: mysql57: follow SELECT_LEX::where API change Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+10 -1) =================================================================== --- ha_mroonga.cpp 2015-03-16 23:39:48 +0900 (c11d45e) +++ ha_mroonga.cpp 2015-03-16 23:43:50 +0900 (ce1124a) @@ -205,6 +205,14 @@ static mysql_mutex_t *mrn_LOCK_open; calculate_key_len(table, key_index, buffer, keypart_map) #endif +#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) +# define MRN_SELECT_LEX_GET_WHERE_COND(select_lex) \ + (select_lex)->where_cond() +#else +# define MRN_SELECT_LEX_GET_WHERE_COND(select_lex) \ + (select_lex)->where +#endif + Rpl_filter *mrn_binlog_filter; Time_zone *mrn_my_tz_UTC; #ifdef MRN_HAVE_TABLE_DEF_CACHE @@ -7754,7 +7762,8 @@ void ha_mroonga::generic_ft_init_ext_add_conditions_fast_order_limit( { MRN_DBUG_ENTER_METHOD(); - Item *where = table->pos_in_table_list->select_lex->where; + Item *where = + MRN_SELECT_LEX_GET_WHERE_COND(table->pos_in_table_list->select_lex); bool is_storage_mode = !(share->wrapper_mode); mrn::ConditionConverter converter(info->ctx, grn_table, is_storage_mode); -------------- next part -------------- HTML����������������������������...Download