← 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: 2009-07-12 19:26:42 UTC
  • mfrom: (1093.1.8 captain)
  • Revision ID: brian@gaz-20090712192642-xtw1hqcs4z9pxfex
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
424
424
%token  ANY_SYM                       /* SQL-2003-R */
425
425
%token  AS                            /* SQL-2003-R */
426
426
%token  ASC                           /* SQL-2003-N */
427
 
%token  ASCII_SYM                     /* MYSQL-FUNC */
428
427
%token  ASENSITIVE_SYM                /* FUTURE-USE */
429
428
%token  AT_SYM                        /* SQL-2003-R */
430
429
%token  AUTOEXTEND_SIZE_SYM
3156
3155
  a dedicated rule is needed here.
3157
3156
*/
3158
3157
function_call_conflict:
3159
 
          ASCII_SYM '(' expr ')'
3160
 
          { $$= new (YYSession->mem_root) Item_func_ascii($3); }
3161
 
        | COALESCE '(' expr_list ')'
 
3158
        COALESCE '(' expr_list ')'
3162
3159
          { $$= new (YYSession->mem_root) Item_func_coalesce(* $3); }
3163
3160
        | COLLATION_SYM '(' expr ')'
3164
3161
          { $$= new (YYSession->mem_root) Item_func_collation($3); }
5467
5464
/* Keyword that we allow for identifiers (except SP labels) */
5468
5465
keyword:
5469
5466
          keyword_sp            {}
5470
 
        | ASCII_SYM             {}
5471
5467
        | BEGIN_SYM             {}
5472
5468
        | BYTE_SYM              {}
5473
5469
        | CACHE_SYM             {}