← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

  • Committer: Brian Aker
  • Date: 2010-12-27 19:18:58 UTC
  • mfrom: (2035 staging)
  • mto: (2035.1.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2037.
  • Revision ID: brian@tangent.org-20101227191858-h11rg8ncrkiklg3f
Manage merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
301
301
            || field_arg->sql_type == DRIZZLE_TYPE_DATETIME
302
302
            || field_arg->sql_type == DRIZZLE_TYPE_TIMESTAMP)
303
303
        {
304
 
          DRIZZLE_TIME ltime;
 
304
          type::Time ltime;
305
305
 
306
306
          if (field_arg->def->get_date(&ltime, TIME_FUZZY_DATE))
307
307
          {
525
525
 
526
526
  if (not table_proto.IsInitialized())
527
527
  {
528
 
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0), table_proto.InitializationErrorString().c_str());
 
528
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
 
529
             table_proto.name().c_str(),
 
530
             table_proto.InitializationErrorString().c_str());
 
531
 
529
532
    return 1;
530
533
  }
531
534
 
543
546
    catch (...)
544
547
    {
545
548
      my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
546
 
               table_proto.InitializationErrorString().empty() ? "": table_proto.InitializationErrorString().c_str());
 
549
               table_proto.name().c_str(),
 
550
               table_proto.InitializationErrorString().c_str());
547
551
 
548
552
      return 1;
549
553
    }