← 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-02-21 17:37:00 UTC
  • mto: (2192.1.1 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2193.
  • Revision ID: brian@tangent.org-20110221173700-6wdfbxm60zq9q9se
Merge in change from REPLICATION to REPLICATE as keyword.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
439
439
%token  REPEATABLE_SYM                /* SQL-2003-N */
440
440
%token  REPEAT_SYM                    /* MYSQL-FUNC */
441
441
%token  REPLACE                       /* MYSQL-FUNC */
 
442
%token  REPLICATE
442
443
%token  REPLICATION
443
444
%token  RESTRICT
444
445
%token  RETURNS_SYM                   /* SQL-2003-R */
970
971
            statement::CreateSchema *statement= (statement::CreateSchema *)Lex->statement;
971
972
            statement->schema_message.mutable_engine()->add_options()->set_name($1.str);
972
973
          }
973
 
        | REPLICATION opt_equal TRUE_SYM
 
974
        | REPLICATE opt_equal TRUE_SYM
974
975
          {
975
976
            parser::buildReplicationOption(Lex, true);
976
977
          }
977
 
        | REPLICATION opt_equal FALSE_SYM
 
978
        | REPLICATE opt_equal FALSE_SYM
978
979
          {
979
980
            parser::buildReplicationOption(Lex, false);
980
981
          }
1029
1030
          {
1030
1031
            Lex->table()->mutable_options()->set_auto_increment_value($3);
1031
1032
          }
1032
 
        | REPLICATION opt_equal TRUE_SYM
 
1033
        | REPLICATE opt_equal TRUE_SYM
1033
1034
          {
1034
1035
            Lex->table()->mutable_options()->set_dont_replicate(false);
1035
1036
          }
1036
 
        | REPLICATION opt_equal FALSE_SYM
 
1037
        | REPLICATE opt_equal FALSE_SYM
1037
1038
          {
1038
1039
            Lex->table()->mutable_options()->set_dont_replicate(true);
1039
1040
          }