← 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: 2011-02-08 06:22:49 UTC
  • mto: (2152.2.1 alter-table)
  • mto: This revision was merged to the branch mainline in revision 2154.
  • Revision ID: brian@tangent.org-20110208062249-z6pwqcm5itu919ry
Merge in timestamp build parser function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1235
1235
          }
1236
1236
        | TIMESTAMP_SYM
1237
1237
          {
1238
 
            $$=DRIZZLE_TYPE_TIMESTAMP;
1239
 
            Lex->length= 0;
1240
 
 
1241
 
            if (Lex->field())
1242
 
              Lex->field()->set_type(message::Table::Field::EPOCH);
 
1238
            $$=parser::buildTimestampColumn(Lex, NULL);
1243
1239
          }
1244
1240
        | TIMESTAMP_SYM '(' NUM ')'
1245
1241
          {
1246
 
            $$=DRIZZLE_TYPE_MICROTIME;
1247
 
            Lex->length= $3.str;
1248
 
 
1249
 
            if (Lex->field())
1250
 
              Lex->field()->set_type(message::Table::Field::EPOCH);
 
1242
            $$=parser::buildTimestampColumn(Lex, $3.str);
1251
1243
          }
1252
1244
        | DATETIME_SYM
1253
1245
          {