← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Monty Taylor
  • Date: 2011-04-03 16:54:43 UTC
  • mfrom: (2239.5.4 drizzle-ga)
  • Revision ID: mordred@inaugust.com-20110403165443-z8a99f7vc6e9xr2h
Merged in Eliot

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
237
237
%token  CATALOG_SYM
238
238
%token  CHAIN_SYM                     /* SQL-2003-N */
239
239
%token  CHANGE_SYM
 
240
%token  CHARSET
240
241
%token  CHAR_SYM                      /* SQL-2003-R */
241
242
%token  CHECKSUM_SYM
242
243
%token  CHECK_SYM                     /* SQL-2003-R */
470
471
%token  SERIAL_SYM
471
472
%token  SESSION_SYM                   /* SQL-2003-N */
472
473
%token  SERVER_SYM
473
 
%token  SET_SYM                           /* SQL-2003-R */
 
474
%token  SET_SYM                       /* SQL-2003-R */
474
475
%token  SET_VAR
475
476
%token  SHARE_SYM
476
477
%token  SHOW
537
538
%token  USING                         /* SQL-2003-R */
538
539
%token  UTC_DATE_SYM
539
540
%token  UTC_TIMESTAMP_SYM
 
541
%token  UTF8_SYM
540
542
%token  UUID_SYM
541
543
%token  VALUES                        /* SQL-2003-R */
542
544
%token  VALUE_SYM                     /* SQL-2003-R */
1074
1076
          {
1075
1077
            parser::buildEngineOption(&Lex, $1.str, $3);
1076
1078
          }
 
1079
        | default_charset
1077
1080
        | default_collation
1078
1081
        ;
1079
1082
 
 
1083
charset:
 
1084
          CHAR_SYM SET_SYM {}
 
1085
        | CHARSET {}
 
1086
        ;
 
1087
 
 
1088
charset_name_or_default:
 
1089
          UTF8_SYM { } 
 
1090
        | DEFAULT    { }
 
1091
        ;
 
1092
 
 
1093
default_charset:
 
1094
          opt_default charset opt_equal charset_name_or_default
 
1095
        {
 
1096
        }
 
1097
 
1080
1098
default_collation:
1081
1099
          opt_default COLLATE_SYM opt_equal collation_name_or_default
1082
1100
          {