← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_close.c

  • Committer: Monty Taylor
  • Date: 2008-10-23 00:05:28 UTC
  • Revision ID: monty@inaugust.com-20081023000528-grdvrd8c4058nutm
Moved my_handler to myisam, which is where it actually belongs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_close.c
15
15
 
16
16
/* close a heap-database */
17
17
 
18
 
#include "heap_priv.h"
19
 
#include <cstdlib>
20
 
 
21
 
using namespace std;
 
18
#include "heapdef.h"
22
19
 
23
20
        /* Close a database open by hp_open() */
24
21
        /* Data is normally not deallocated */
26
23
int heap_close(HP_INFO *info)
27
24
{
28
25
  int tmp;
29
 
  THR_LOCK_heap.lock();
 
26
  pthread_mutex_lock(&THR_LOCK_heap);
30
27
  tmp= hp_close(info);
31
 
  THR_LOCK_heap.unlock();
32
 
 
 
28
  pthread_mutex_unlock(&THR_LOCK_heap);
33
29
  return(tmp);
34
30
}
35
31
 
36
32
 
37
 
int hp_close(HP_INFO *info)
 
33
int hp_close(register HP_INFO *info)
38
34
{
39
35
  int error=0;
40
 
  info->getShare()->changed=0;
41
 
  heap_open_list.remove(info);
42
 
  if (!--info->getShare()->open_count && info->getShare()->delete_on_close)
43
 
    hp_free(info->getShare());                          /* Table was deleted */
44
 
  delete info;
 
36
  info->s->changed=0;
 
37
  if (info->open_list.data)
 
38
    heap_open_list=list_delete(heap_open_list,&info->open_list);
 
39
  if (!--info->s->open_count && info->s->delete_on_close)
 
40
    hp_free(info->s);                           /* Table was deleted */
 
41
  free((unsigned char*) info);
45
42
  return(error);
46
43
}