← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2010-08-19 16:45:03 UTC
  • mfrom: (1711.6.11 staging)
  • Revision ID: brian@tangent.org-20100819164503-t7rhibp5s7bv3dtu
Merge of signals, plus build fix for FreeBSD. Also contains memset/constructor patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
696
696
%token  SET_VAR
697
697
%token  SHARE_SYM
698
698
%token  SHOW
699
 
%token  SHUTDOWN
700
699
%token  SIMPLE_SYM                    /* SQL-2003-N */
701
700
%token  SNAPSHOT_SYM
702
701
%token  SPECIFIC_SYM                  /* SQL-2003-R */
5939
5938
        | SESSION_SYM              {}
5940
5939
        | SIMPLE_SYM               {}
5941
5940
        | SHARE_SYM                {}
5942
 
        | SHUTDOWN                 {}
5943
5941
        | SNAPSHOT_SYM             {}
5944
5942
        | SQL_BUFFER_RESULT        {}
5945
5943
        | STATUS_SYM               {}