← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Monty Taylor
  • Date: 2009-10-06 19:14:39 UTC
  • mfrom: (1130.2.18 plugin-base-class)
  • mto: This revision was merged to the branch mainline in revision 1184.
  • Revision ID: mordred@inaugust.com-20091006191439-fd1vvlp22654l3k3
Merged latest plugin-base-class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
58
58
                                     const bitset<HTON_BIT_SIZE> &flags_arg,
59
59
                                     size_t savepoint_offset_arg,
60
60
                                     bool support_2pc)
61
 
    : Plugin(name_arg), two_phase_commit(support_2pc), enabled(true),
 
61
    : Plugin(name_arg),
 
62
      two_phase_commit(support_2pc),
 
63
      enabled(true),
62
64
      flags(flags_arg),
63
65
      savepoint_offset(savepoint_alloc_size),
64
66
      orig_savepoint_offset(savepoint_offset_arg),
93
95
  if (ha_info->is_started())
94
96
  {
95
97
    /*
96
 
      table_share can be NULL in ha_delete_table(). See implementation
97
 
      of standalone function ha_delete_table() in sql_base.cc.
98
 
    */
 
98
     * table_share can be NULL in plugin::StorageEngine::deleteTable().
 
99
     */
99
100
    ha_info->set_trx_read_write();
100
101
  }
101
102
}
808
809
plugin::TableNameIterator::~TableNameIterator()
809
810
{
810
811
  delete current_implementation;
 
812
  if (current_implementation != default_implementation)
 
813
  {
 
814
    delete default_implementation;
 
815
  }
811
816
}
812
817
 
813
818
int plugin::TableNameIterator::next(string *name)