← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.cc

Merge Stwart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.cc
1223
1223
 
1224
1224
    if (pfield.has_options() &&
1225
1225
        pfield.options().has_default_expression() &&
1226
 
        pfield.options().default_expression().compare("NOW()") == 0)
 
1226
        pfield.options().default_expression().compare("CURRENT_TIMESTAMP") == 0)
1227
1227
    {
1228
1228
      if (pfield.options().has_update_expression() &&
1229
 
          pfield.options().update_expression().compare("NOW()") == 0)
 
1229
          pfield.options().update_expression().compare("CURRENT_TIMESTAMP") == 0)
1230
1230
      {
1231
1231
        unireg_type= Field::TIMESTAMP_DNUN_FIELD;
1232
1232
      }
1239
1239
    }
1240
1240
    else if (pfield.has_options() &&
1241
1241
             pfield.options().has_update_expression() &&
1242
 
             pfield.options().update_expression().compare("NOW()") == 0)
 
1242
             pfield.options().update_expression().compare("CURRENT_TIMESTAMP") == 0)
1243
1243
    {
1244
1244
      unireg_type= Field::TIMESTAMP_UN_FIELD;
1245
1245
    }