← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-07-08 04:26:02 UTC
  • mto: (1089.3.4 merge)
  • mto: This revision was merged to the branch mainline in revision 1092.
  • Revision ID: osullivan.padraig@gmail.com-20090708042602-x4hmf9ny8dcpvb22
Replaced an instance where a uint8_t type was being used to hold a
collection of flags. Converted it to a std::bitset<2> instead.

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));