← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
281
281
 
282
282
  share->setTableProto(new(nothrow) message::Table(table));
283
283
 
284
 
  share->storage_engine= ha_resolve_by_name(session, table.engine().name());
 
284
  share->storage_engine= plugin::StorageEngine::findByName(session, table.engine().name());
285
285
 
286
286
  message::Table::TableOptions table_options;
287
287
 
1206
1206
 
1207
1207
  message::Table table;
1208
1208
 
1209
 
  error= StorageEngine::getTableProto(share->normalized_path.str, &table);
 
1209
  error= plugin::StorageEngine::getTableProto(share->normalized_path.str,
 
1210
                                              &table);
1210
1211
 
1211
1212
  if (error != EEXIST)
1212
1213
  {