← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_close.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_close.cc
42
42
    if (mi_lock_database(info,F_UNLCK))
43
43
      error=errno;
44
44
  }
45
 
  pthread_mutex_lock(&share->intern_lock);
46
45
 
47
46
  if (share->options & HA_OPTION_READ_ONLY_DATA)
48
47
  {
57
56
  }
58
57
  flag= !--share->reopen;
59
58
  myisam_open_list.remove(info);
60
 
  pthread_mutex_unlock(&share->intern_lock);
61
59
 
62
60
  void * rec_buff_ptr= mi_get_rec_buff_ptr(info, info->rec_buff);
63
61
  if (rec_buff_ptr != NULL)
89
87
      free((unsigned char*) share->decode_tables);
90
88
    }
91
89
    share->lock.deinit();
92
 
    pthread_mutex_destroy(&share->intern_lock);
93
 
    {
94
 
      int keys= share->state.header.keys;
95
 
      pthread_rwlock_destroy(&share->mmap_lock);
96
 
      for (int i= 0; i < keys; i++)
97
 
      {
98
 
        pthread_rwlock_destroy(&share->key_root_lock[i]);
99
 
      }
100
 
    }
101
90
    delete info->s->in_use;
102
91
    free((unsigned char*) info->s);
103
92
  }