← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

  • Committer: Brian Aker
  • Date: 2009-11-24 02:06:37 UTC
  • mfrom: (1223.1.7 push)
  • Revision ID: brian@gaz-20091124020637-9gb65vj98x1arydm
Merge for staging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
650
650
  return heap_indexes_are_disabled(file);
651
651
}
652
652
 
653
 
THR_LOCK_DATA **ha_heap::store_lock(Session *,
654
 
                                    THR_LOCK_DATA **to,
655
 
                                    enum thr_lock_type lock_type)
656
 
{
657
 
  if (lock_type != TL_IGNORE && file->lock.type == TL_UNLOCK)
658
 
    file->lock.type=lock_type;
659
 
  *to++= &file->lock;
660
 
  return to;
661
 
}
662
 
 
663
653
void ha_heap::drop_table(const char *)
664
654
{
665
655
  file->s->delete_on_close= 1;