← 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: 2011-04-04 21:37:55 UTC
  • mfrom: (2241.6.2 drizzle-trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: brian@tangent.org-20110404213755-k4kl3qd5fkbvjmhe
Merge in owner tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
180
180
  Currently there are 70 shift/reduce conflicts.
181
181
  We should not introduce new conflicts any more.
182
182
*/
183
 
%expect 79
 
183
%expect 80
184
184
 
185
185
/*
186
186
   Comments for TOKENS.
201
201
 
202
202
%token  ABORT_SYM                     /* INTERNAL (used in lex) */
203
203
%token  ACTION                        /* SQL-2003-N */
 
204
%token  ADDDATE_SYM                   /* MYSQL-FUNC */
204
205
%token  ADD_SYM                           /* SQL-2003-R */
205
 
%token  ADDDATE_SYM                   /* MYSQL-FUNC */
206
206
%token  AFTER_SYM                     /* SQL-2003-N */
207
207
%token  AGGREGATE_SYM
208
208
%token  ALL                           /* SQL-2003-R */
283
283
%token  DECIMAL_SYM                   /* SQL-2003-R */
284
284
%token  DECLARE_SYM                   /* SQL-2003-R */
285
285
%token  DEFAULT                       /* SQL-2003-R */
 
286
%token  DEFINER
286
287
%token  DELETE_SYM                    /* SQL-2003-R */
287
288
%token  DESC                          /* SQL-2003-N */
288
289
%token  DESCRIBE                      /* SQL-2003-R */
291
292
%token  DISCARD
292
293
%token  DISTINCT                      /* SQL-2003-R */
293
294
%token  DIV_SYM
 
295
%token  DOUBLE_SYM                    /* SQL-2003-R */
294
296
%token  DO_SYM
295
 
%token  DOUBLE_SYM                    /* SQL-2003-R */
296
297
%token  DROP                          /* SQL-2003-R */
297
298
%token  DUMPFILE
298
299
%token  DUPLICATE_SYM
330
331
%token  FULL                          /* SQL-2003-R */
331
332
%token  GE
332
333
%token  GLOBAL_SYM                    /* SQL-2003-R */
 
334
%token  GROUP_CONCAT_SYM
333
335
%token  GROUP_SYM                     /* SQL-2003-R */
334
 
%token  GROUP_CONCAT_SYM
335
336
%token  HASH_SYM
336
337
%token  HAVING                        /* SQL-2003-R */
337
338
%token  HEX_NUM
356
357
%token  INTERVAL_SYM                  /* SQL-2003-R */
357
358
%token  INTO                          /* SQL-2003-R */
358
359
%token  INT_SYM                       /* SQL-2003-R */
 
360
%token  INVOKER
359
361
%token  IN_SYM                        /* SQL-2003-R */
360
362
%token  IS                            /* SQL-2003-R */
361
363
%token  ISOLATION                     /* SQL-2003-R */
440
442
%token  READ_WRITE_SYM
441
443
%token  REAL                          /* SQL-2003-R */
442
444
%token  REDUNDANT_SYM
 
445
%token  REFERENCES                    /* SQL-2003-R */
443
446
%token  REGEXP_SYM
444
 
%token  REFERENCES                    /* SQL-2003-R */
445
447
%token  RELEASE_SYM                   /* SQL-2003-R */
446
448
%token  RENAME
447
449
%token  REPEATABLE_SYM                /* SQL-2003-N */
469
471
%token  SEPARATOR_SYM
470
472
%token  SERIALIZABLE_SYM              /* SQL-2003-N */
471
473
%token  SERIAL_SYM
 
474
%token  SERVER_SYM
472
475
%token  SESSION_SYM                   /* SQL-2003-N */
473
 
%token  SERVER_SYM
474
476
%token  SET_SYM                       /* SQL-2003-R */
475
477
%token  SET_VAR
476
478
%token  SHARE_SYM
511
513
%token  TEXT_STRING
512
514
%token  TEXT_SYM
513
515
%token  THEN_SYM                      /* SQL-2003-R */
514
 
%token  TIME_SYM                 /* SQL-2003-R */
515
 
%token  TIMESTAMP_SYM                 /* SQL-2003-R */
516
516
%token  TIMESTAMP_ADD
517
517
%token  TIMESTAMP_DIFF
 
518
%token  TIMESTAMP_SYM                 /* SQL-2003-R */
 
519
%token  TIME_SYM                 /* SQL-2003-R */
518
520
%token  TO_SYM                        /* SQL-2003-R */
519
521
%token  TRAILING                      /* SQL-2003-R */
520
522
%token  TRANSACTION_SYM
1001
1003
          {
1002
1004
            parser::buildReplicationOption(&Lex, false);
1003
1005
          }
 
1006
        | DEFINER TEXT_STRING_sys
 
1007
          {
 
1008
            parser::buildSchemaDefiner(&Lex, $2);
 
1009
          }
 
1010
        | DEFINER CURRENT_USER optional_braces
 
1011
          {
 
1012
            parser::buildSchemaDefiner(&Lex, *session->user());
 
1013
          }
1004
1014
        | ident_or_text '=' ident_or_text
1005
1015
          {
1006
1016
            parser::buildSchemaOption(&Lex, $1.str, $3);
1060
1070
          {
1061
1071
            message::set_is_replicated(*Lex.table(), false);
1062
1072
          }
 
1073
        | DEFINER TEXT_STRING_sys
 
1074
          {
 
1075
            drizzled::identifier::User user($2.str);
 
1076
            message::set_definer(*Lex.table(), user);
 
1077
          }
 
1078
        | DEFINER CURRENT_USER optional_braces
 
1079
          {
 
1080
            message::set_definer(*Lex.table(), *session->user());
 
1081
          }
1063
1082
        |  ROW_FORMAT_SYM '=' row_format_or_text
1064
1083
          {
1065
1084
            parser::buildEngineOption(&Lex, "ROW_FORMAT", $3);