← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Brian Aker
  • Date: 2010-10-20 20:26:18 UTC
  • mfrom: (1859.2.13 refactor)
  • Revision ID: brian@tangent.org-20101020202618-9222n39lm329urv5
Merge for Brian 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
54
54
#include <drizzled/table_proto.h>
55
55
#include <drizzled/plugin/event_observer.h>
56
56
 
 
57
#include <drizzled/table/shell.h>
 
58
 
57
59
#include <boost/algorithm/string/compare.hpp>
58
60
 
59
61
static bool shutdown_has_begun= false; // Once we put in the container for the vector/etc for engines this will go away.
501
503
                               message::Table& table_message)
502
504
{
503
505
  int error= 1;
504
 
  Table table;
505
506
  TableShare share(identifier);
 
507
  table::Shell table(share);
506
508
  message::Table tmp_proto;
507
509
 
508
510
  if (share.parse_table_proto(session, table_message) || share.open_table_from_share(&session, identifier, "", 0, 0, table))