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.
mroonga · Mar 16, 2015 · edb11b0 · edb11b0
1 parent 59d0507
commit edb11b0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -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