← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

  • Committer: Lee Bieber
  • Date: 2010-12-24 05:08:44 UTC
  • mfrom: (2026.1.2 build)
  • Revision ID: kalebral@gmail.com-20101224050844-9jll4ywf0rmhxaf4
Merge Brian - Update to tests, we just want to look at our own tables, not global.
Merge Brian - Final bits of encapsulation work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
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
    }