← 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-12-16 04:01:22 UTC
  • mfrom: (1996.2.1 compare)
  • Revision ID: brian@tangent.org-20101216040122-eodh5shwsij35ybe
Merge in uuid tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
763
763
%token  USING                         /* SQL-2003-R */
764
764
%token  UTC_DATE_SYM
765
765
%token  UTC_TIMESTAMP_SYM
 
766
%token  UUID_SYM
766
767
%token  VALUES                        /* SQL-2003-R */
767
768
%token  VALUE_SYM                     /* SQL-2003-R */
768
769
%token  VARBINARY
1692
1693
            if (statement->current_proto_field)
1693
1694
              statement->current_proto_field->set_type(message::Table::Field::ENUM);
1694
1695
          }
 
1696
          | UUID_SYM
 
1697
          {
 
1698
            $$=DRIZZLE_TYPE_UUID;
 
1699
 
 
1700
            statement::CreateTable *statement=
 
1701
              (statement::CreateTable *)Lex->statement;
 
1702
 
 
1703
            if (statement->current_proto_field)
 
1704
              statement->current_proto_field->set_type(message::Table::Field::UUID);
 
1705
          }
1695
1706
        | SERIAL_SYM
1696
1707
          {
1697
1708
            $$=DRIZZLE_TYPE_LONGLONG;
3319
3330
              DRIZZLE_YYABORT;
3320
3331
            }
3321
3332
          }
 
3333
        | UUID_SYM '(' ')'
 
3334
          {
 
3335
            if (! ($$= reserved_keyword_function(YYSession, "uuid", NULL)))
 
3336
            {
 
3337
              DRIZZLE_YYABORT;
 
3338
            }
 
3339
            Lex->setCacheable(false);
 
3340
          }
3322
3341
        | WAIT_SYM '(' expr ',' expr ')'
3323
3342
          {
3324
3343
            std::string wait_str("wait");