← Back to branch summary

~posulliv/drizzle/memcached_applier

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

refactored function/ascii into plugin/ascii

Show diffs side-by-side

added added

removed removed

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