← 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-11-12 16:13:04 UTC
  • mfrom: (1211.1.7 staging)
  • Revision ID: brian@gaz-20091112161304-opamiauv36fg0n6u
Rollup of Brian, Padraig, and Stewart patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1607
1607
            Lex->length=(char*) 0; /* use default length */
1608
1608
          }
1609
1609
        | DECIMAL_SYM float_options
1610
 
          { $$=DRIZZLE_TYPE_NEWDECIMAL;}
 
1610
          { $$=DRIZZLE_TYPE_DECIMAL;}
1611
1611
        | NUMERIC_SYM float_options
1612
 
          { $$=DRIZZLE_TYPE_NEWDECIMAL;}
 
1612
          { $$=DRIZZLE_TYPE_DECIMAL;}
1613
1613
        | FIXED_SYM float_options
1614
 
          { $$=DRIZZLE_TYPE_NEWDECIMAL;}
 
1614
          { $$=DRIZZLE_TYPE_DECIMAL;}
1615
1615
        | ENUM_SYM
1616
1616
          {Lex->interval_list.empty();}
1617
 
          '(' string_list ')' opt_binary
 
1617
          '(' string_list ')'
1618
1618
          { $$=DRIZZLE_TYPE_ENUM; }
1619
1619
        | SERIAL_SYM
1620
1620
          {