← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

Merged in latest plugin-slot-reorg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
284
284
 
285
285
  share->setTableProto(new(std::nothrow) message::Table(table));
286
286
 
287
 
  share->storage_engine= ha_resolve_by_name(session, table.engine().name());
 
287
  share->storage_engine= plugin::StorageEngine::findByName(session, table.engine().name());
288
288
 
289
289
  message::Table::TableOptions table_options;
290
290
 
1196
1196
 
1197
1197
  message::Table table;
1198
1198
 
1199
 
  plugin::Registry &plugins= plugin::Registry::singleton();
1200
 
  error= plugins.storage_engine.getTableProto(share->normalized_path.str,
 
1199
  error= plugin::StorageEngine::getTableProto(share->normalized_path.str,
1201
1200
                                              &table);
1202
1201
 
1203
1202
  if (error != EEXIST)