← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

Merged Padraig from lp:~posulliv/drizzle/code-cleanup-c++-use-bitset

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
365
365
 
366
366
    MODE_ONLY_FULL_GROUP_BY is enabled here by default
367
367
  */
368
 
  if (!group_list && select_lex->full_group_by_flag == (NON_AGG_FIELD_USED | SUM_FUNC_USED))
 
368
  if (! group_list && 
 
369
      select_lex->full_group_by_flag.test(NON_AGG_FIELD_USED) &&
 
370
      select_lex->full_group_by_flag.test(SUM_FUNC_USED))
369
371
  {
370
372
    my_message(ER_MIX_OF_GROUP_FUNC_AND_FIELDS,
371
373
               ER(ER_MIX_OF_GROUP_FUNC_AND_FIELDS), MYF(0));
1039
1041
 
1040
1042
    tmp_table_param.hidden_field_count= (all_fields.elements -
1041
1043
           fields_list.elements);
1042
 
    order_st *tmp_group= ((!simple_group && !(test_flags & TEST_NO_KEY_GROUP)) ? group_list :
1043
 
                                                             (order_st*) 0);
 
1044
    order_st *tmp_group= ((!simple_group && 
 
1045
                           ! (test_flags.test(TEST_NO_KEY_GROUP))) ? group_list :
 
1046
                                                                     (order_st*) 0);
1044
1047
    /*
1045
1048
      Pushing LIMIT to the temporary table creation is not applicable
1046
1049
      when there is order_st BY or GROUP BY or there is no GROUP BY, but