← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Jay Pipes
  • Date: 2009-02-04 15:44:25 UTC
  • mfrom: (829 drizzle)
  • mto: This revision was merged to the branch mainline in revision 830.
  • Revision ID: jpipes@serialcoder-20090204154425-th8xfk2ujz2y8xwg
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
89
89
#include <drizzled/item/insert_value.h>
90
90
#include <drizzled/lex_string.h>
91
91
#include <drizzled/function/get_system_var.h>
 
92
#include <mysys/thr_lock.h>
92
93
 
93
94
class Table_ident;
94
95
class Item;
124
125
    DRIZZLE_YYABORT;                      \
125
126
  }
126
127
 
 
128
 
127
129
/*
128
130
  Work around for broken code generated by bison 1.875.
129
131
 
852
854
%token  TO_SYM                        /* SQL-2003-R */
853
855
%token  TRAILING                      /* SQL-2003-R */
854
856
%token  TRANSACTION_SYM
855
 
%token  TRANSACTIONAL_SYM
856
857
%token  TRIM                          /* SQL-2003-N */
857
858
%token  TRUE_SYM                      /* SQL-2003-R */
858
859
%token  TRUNCATE_SYM
4473
4474
        | LONG_NUM      { int error; $$= (ulong) my_strtoll10($1.str, (char**) 0, &error); }
4474
4475
        | ULONGLONG_NUM { int error; $$= (ulong) my_strtoll10($1.str, (char**) 0, &error); }
4475
4476
        | dec_num_error { DRIZZLE_YYABORT; }
4476
 
        ;
 
4477
        ;
4477
4478
 
4478
4479
ulonglong_num:
4479
4480
          NUM           { int error; $$= (uint64_t) my_strtoll10($1.str, (char**) 0, &error); }
6028
6029
        | TEXT_SYM                 {}
6029
6030
        | THAN_SYM                 {}
6030
6031
        | TRANSACTION_SYM          {}
6031
 
        | TRANSACTIONAL_SYM        {}
6032
6032
        | TIMESTAMP                {}
6033
6033
        | TIMESTAMP_ADD            {}
6034
6034
        | TIMESTAMP_DIFF           {}