← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Stewart Smith
  • Date: 2009-07-20 02:31:33 UTC
  • mto: (1093.1.29 captain)
  • mto: This revision was merged to the branch mainline in revision 1102.
  • Revision ID: stewart@flamingspork.com-20090720023133-8waudxj8ufhqt6tz
use StorageEngine::getTableProto instead of drizzle_read_table_proto. We only read the proto file now in SE::getTableProto.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1234
1234
{
1235
1235
  int error;
1236
1236
  bool error_given;
1237
 
  string proto_path("");
1238
1237
 
1239
1238
  error= 1;
1240
1239
  error_given= 0;
1241
1240
 
1242
 
  proto_path.reserve(FN_REFLEN);
1243
 
  proto_path.append(share->normalized_path.str);
1244
 
 
1245
 
  proto_path.append(".dfe");
1246
 
 
1247
1241
  drizzled::message::Table table;
1248
1242
 
1249
 
  if ((error= drizzle_read_table_proto(proto_path.c_str(), &table)))
 
1243
  error= StorageEngine::getTableProto(share->normalized_path.str, &table);
 
1244
 
 
1245
  if(error!=EEXIST)
1250
1246
  {
1251
1247
    if (error>0)
1252
1248
    {