← 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-22 21:50:32 UTC
  • mto: (2026.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2027.
  • Revision ID: brian@tangent.org-20101222215032-uc4fg4ff7jfwdvl6
Cleanup error messages around bad table definitions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
524
524
 
525
525
  if (not table_proto.IsInitialized())
526
526
  {
527
 
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0), table_proto.InitializationErrorString().c_str());
 
527
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
 
528
             table_proto.name().c_str(),
 
529
             table_proto.InitializationErrorString().c_str());
 
530
 
528
531
    return 1;
529
532
  }
530
533
 
542
545
    catch (...)
543
546
    {
544
547
      my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
545
 
               table_proto.InitializationErrorString().empty() ? "": table_proto.InitializationErrorString().c_str());
 
548
               table_proto.name().c_str(),
 
549
               table_proto.InitializationErrorString().c_str());
546
550
 
547
551
      return 1;
548
552
    }