← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Mark Atwood
  • Date: 2011-08-17 06:03:11 UTC
  • mfrom: (2398.1.1 drizzle-IPv6Address)
  • Revision ID: me@mark.atwood.name-20110817060311-ujuf1695rwsnfowu
merge lp:~mumair/drizzle/drizzle-IPV6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
365
365
%token  IS                            /* SQL-2003-R */
366
366
%token  ISOLATION                     /* SQL-2003-R */
367
367
%token  ITERATE_SYM
 
368
%token  IPV6_SYM
368
369
%token  JOIN_SYM                      /* SQL-2003-R */
369
370
%token  KEYS
370
371
%token  KEY_BLOCK_SIZE
1335
1336
          {
1336
1337
            $$= parser::buildUuidColumn(&Lex);
1337
1338
          }
 
1339
        | IPV6_SYM opt_attribute
 
1340
          {
 
1341
            $$= parser::buildIPv6Column(&Lex);
 
1342
          }
1338
1343
        | BOOLEAN_SYM opt_attribute_boolean
1339
1344
          {
1340
1345
            $$= parser::buildBooleanColumn(&Lex);
3047
3052
            }
3048
3053
            Lex.setCacheable(false);
3049
3054
          }
 
3055
        | IPV6_SYM '(' ')'
 
3056
          {
 
3057
            if (! ($$= parser::reserved_keyword_function(YYSession, "ipv6", NULL)))
 
3058
            {
 
3059
              DRIZZLE_YYABORT;
 
3060
            }
 
3061
            Lex.setCacheable(false);
 
3062
          }
3050
3063
        | WAIT_SYM '(' expr ',' expr ')'
3051
3064
          {
3052
3065
            List<Item> *args= new (YYSession->mem_root) List<Item>;
5296
5309
        | IMPORT                   {}
5297
5310
        | INDEXES                  {}
5298
5311
        | ISOLATION                {}
 
5312
        | IPV6_SYM                 {}
5299
5313
        | KEY_BLOCK_SIZE           {}
5300
5314
        | LAST_SYM                 {}
5301
5315
        | LEVEL_SYM                {}