← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

  • Committer: Brian Aker
  • Date: 2010-06-24 05:34:43 UTC
  • mto: (1637.1.4 staging)
  • mto: This revision was merged to the branch mainline in revision 1638.
  • Revision ID: brian@gaz-20100624053443-ryl3s27qnut6xtub
This fixes the parser to no longer do the bad syntax around the cross join
(MySQL got it wrong, and allowed on).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.h
514
514
          defined as SUM_FUNC_USED.
515
515
  */
516
516
  std::bitset<2> full_group_by_flag;
 
517
 
517
518
  void init_query();
518
519
  void init_select();
519
520
  Select_Lex_Unit* master_unit();
929
930
    }
930
931
    return false;
931
932
  }
 
933
  bool is_cross; // CROSS keyword was used
932
934
};
933
935
 
934
936
extern void lex_start(Session *session);