← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Lee Bieber
  • Date: 2010-12-24 04:29:32 UTC
  • mfrom: (2017.2.3 integer-refactor)
  • mto: This revision was merged to the branch mainline in revision 2027.
  • Revision ID: kalebral@gmail.com-20101224042932-qb07lchviqbesgln
Merge Brian - Final bits of encapsulation work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
453
453
    std::string error_message;
454
454
    identifier.getSQLPath(error_message);
455
455
 
456
 
    error_message.append(" : ");
457
 
    error_message.append(src_proto->InitializationErrorString());
458
 
 
459
 
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0), error_message.c_str());
 
456
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
 
457
             error_message.c_str(),
 
458
             src_proto->InitializationErrorString().c_str());
460
459
 
461
460
    return ER_CORRUPT_TABLE_DEFINITION;
462
461
  }
470
469
  {
471
470
    std::string error_message;
472
471
    identifier.getSQLPath(error_message);
473
 
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0), error_message.c_str());
 
472
 
 
473
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0), error_message.c_str(), "");
474
474
 
475
475
    return ER_CORRUPT_TABLE_DEFINITION;
476
476
  }
1076
1076
 
1077
1077
  if (not success)
1078
1078
  {
 
1079
    std::string error_message;
 
1080
    identifier.getSQLPath(error_message);
 
1081
 
1079
1082
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
 
1083
             error_message.c_str(),
1080
1084
             table_message.InitializationErrorString().c_str());
1081
1085
    delete output;
1082
1086
 
1164
1168
    catch (...)
1165
1169
    {
1166
1170
      my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
 
1171
               table_message.name().empty() ? path.c_str() : table_message.name().c_str(),
1167
1172
               table_message.InitializationErrorString().empty() ? "": table_message.InitializationErrorString().c_str());
1168
1173
    }
1169
1174
  }