← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Monty Taylor
  • Date: 2008-07-30 22:14:34 UTC
  • mfrom: (239 drizzle)
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 243.
  • Revision ID: monty@inaugust.com-20080730221434-aqmamn79nvzgbvks
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
675
675
%token  NULL_SYM                      /* SQL-2003-R */
676
676
%token  NUM
677
677
%token  NUMERIC_SYM                   /* SQL-2003-R */
678
 
%token  NVARCHAR_SYM
679
678
%token  OFFLINE_SYM
680
679
%token  OFFSET_SYM
681
680
%token  ON                            /* SQL-2003-R */
702
701
%token  PLUGINS_SYM
703
702
%token  PLUGIN_SYM
704
703
%token  POINT_SYM
705
 
%token  POLYGON
706
704
%token  PORT_SYM
707
705
%token  POSITION_SYM                  /* SQL-2003-N */
708
706
%token  PRECISION                     /* SQL-2003-R */
710
708
%token  PRIMARY_SYM                   /* SQL-2003-R */
711
709
%token  PROCESS
712
710
%token  PROCESSLIST_SYM
713
 
%token  PROFILE_SYM
714
711
%token  PROFILES_SYM
715
712
%token  PURGE
716
713
%token  QUARTER_SYM
1826
1823
        | char '(' NUM ')' opt_binary
1827
1824
          {
1828
1825
            Lex->length=$3.str;
1829
 
            $$=DRIZZLE_TYPE_STRING;
 
1826
            $$=DRIZZLE_TYPE_VARCHAR;
1830
1827
          }
1831
1828
        | char opt_binary
1832
1829
          {
1833
1830
            Lex->length=(char*) "1";
1834
 
            $$=DRIZZLE_TYPE_STRING;
 
1831
            $$=DRIZZLE_TYPE_VARCHAR;
1835
1832
          }
1836
1833
        | varchar '(' NUM ')' opt_binary
1837
1834
          {
6515
6512
        | NODEGROUP_SYM            {}
6516
6513
        | NONE_SYM                 {}
6517
6514
        | NOWAIT_SYM               {}
6518
 
        | NVARCHAR_SYM             {}
6519
6515
        | OFFLINE_SYM              {}
6520
6516
        | OFFSET_SYM               {}
6521
6517
        | ONE_SHOT_SYM             {}
6533
6529
        | PREV_SYM                 {}
6534
6530
        | PROCESS                  {}
6535
6531
        | PROCESSLIST_SYM          {}
6536
 
        | PROFILE_SYM              {}
6537
 
        | PROFILES_SYM             {}
6538
6532
        | QUARTER_SYM              {}
6539
6533
        | QUERY_SYM                {}
6540
6534
        | QUICK                    {}