← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2009-03-25 18:35:47 UTC
  • mfrom: (962.1.6 merge)
  • Revision ID: brian@tangent.org-20090325183547-l79aiecte974hmx3
Merge in factoring out sql_plugin work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
277
277
  }
278
278
  hash_free(&share->name_hash);
279
279
 
280
 
  plugin_unlock(NULL, share->db_plugin);
281
280
  share->db_plugin= NULL;
282
281
 
283
282
  /* We must copy mem_root from share because share is allocated through it */
4737
4736
  if (temp_pool_slot != MY_BIT_NONE)
4738
4737
    bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
4739
4738
 
4740
 
  plugin_unlock(0, s->db_plugin);
4741
 
 
4742
4739
  free_root(&own_root, MYF(0)); /* the table is allocated in its own root */
4743
4740
  session->set_proc_info(save_proc_info);
4744
4741
 
4824
4821
  (void) table->file->close();                  // This deletes the table !
4825
4822
  delete table->file;
4826
4823
  table->file=0;
4827
 
  plugin_unlock(0, table->s->db_plugin);
4828
 
  share.db_plugin= my_plugin_lock(0, &share.db_plugin);
 
4824
  share.db_plugin= plugin_lock(0, &share.db_plugin);
4829
4825
  new_table.s= table->s;                       // Keep old share
4830
4826
  *table= new_table;
4831
4827
  *table->s= share;