← 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-01-13 05:06:32 UTC
  • mto: (2079.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110113050632-92b0129n2urv5v0w
Fix for test on drop (error message change).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
3198
3198
          { $$= new (YYSession->mem_root) Item_func_collation($3); }
3199
3199
        | DATABASE '(' ')'
3200
3200
          {
3201
 
            std::string database_str("database");
3202
 
            if (! ($$= reserved_keyword_function(YYSession, database_str, NULL)))
 
3201
            if (! ($$= reserved_keyword_function(YYSession, "database", NULL)))
 
3202
            {
 
3203
              DRIZZLE_YYABORT;
 
3204
            }
 
3205
            Lex->setCacheable(false);
 
3206
          }
 
3207
        | CATALOG_SYM '(' ')'
 
3208
          {
 
3209
            if (! ($$= reserved_keyword_function(YYSession, "catalog", NULL)))
3203
3210
            {
3204
3211
              DRIZZLE_YYABORT;
3205
3212
            }