← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_close.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_close.cc
23
23
#include "myisam_priv.h"
24
24
#include <cstdlib>
25
25
 
 
26
using namespace drizzled;
 
27
 
26
28
int mi_close(MI_INFO *info)
27
29
{
28
30
  int error=0,flag;
77
79
      */
78
80
      if (share->mode != O_RDONLY && mi_is_crashed(info))
79
81
        mi_state_info_write(share->kfile, &share->state, 1);
80
 
      if (my_close(share->kfile,MYF(0)))
 
82
      if (internal::my_close(share->kfile,MYF(0)))
81
83
        error = errno;
82
84
    }
83
85
    if (share->decode_trees)
100
102
  }
101
103
  pthread_mutex_unlock(&THR_LOCK_myisam);
102
104
 
103
 
  if (info->dfile >= 0 && my_close(info->dfile,MYF(0)))
 
105
  if (info->dfile >= 0 && internal::my_close(info->dfile,MYF(0)))
104
106
    error = errno;
105
107
 
106
108
  free((unsigned char*) info);