← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_panic.cc

  • Committer: Stewart Smith
  • Date: 2009-12-02 06:01:21 UTC
  • mto: (1237.1.2 push)
  • mto: This revision was merged to the branch mainline in revision 1238.
  • Revision ID: stewart@flamingspork.com-20091202060121-68gyfqifqcjcmi2v
my_end() no longer requires an argument (we removed them all)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_panic.cc
16
16
#include "myisam_priv.h"
17
17
 
18
18
using namespace std;
19
 
using namespace drizzled;
20
19
 
21
20
        /* if flag == HA_PANIC_CLOSE then all misam files are closed */
22
21
        /* if flag == HA_PANIC_WRITE then all misam files are unlocked and
40
39
    case HA_PANIC_CLOSE:
41
40
      pthread_mutex_unlock(&THR_LOCK_myisam);   /* Not exactly right... */
42
41
      if (mi_close(info))
43
 
        error=errno;
 
42
        error=my_errno;
44
43
      pthread_mutex_lock(&THR_LOCK_myisam);
45
44
      break;
46
45
    case HA_PANIC_WRITE:                /* Do this to free databases */
49
48
        break;
50
49
#endif
51
50
      if (flush_key_blocks(info->s->key_cache, info->s->kfile, FLUSH_RELEASE))
52
 
        error=errno;
 
51
        error=my_errno;
53
52
      if (info->opt_flag & WRITE_CACHE_USED)
54
53
        if (flush_io_cache(&info->rec_cache))
55
 
          error=errno;
 
54
          error=my_errno;
56
55
      if (info->opt_flag & READ_CACHE_USED)
57
56
      {
58
57
        if (flush_io_cache(&info->rec_cache))
59
 
          error=errno;
60
 
        reinit_io_cache(&info->rec_cache,internal::READ_CACHE,0,
 
58
          error=my_errno;
 
59
        reinit_io_cache(&info->rec_cache,READ_CACHE,0,
61
60
                       (bool) (info->lock_type != F_UNLCK),1);
62
61
      }
63
62
      if (info->lock_type != F_UNLCK && ! info->was_locked)
64
63
      {
65
64
        info->was_locked=info->lock_type;
66
65
        if (mi_lock_database(info,F_UNLCK))
67
 
          error=errno;
 
66
          error=my_errno;
68
67
      }
69
68
#ifdef CANT_OPEN_FILES_TWICE
70
 
      if (info->s->kfile >= 0 && internal::my_close(info->s->kfile,MYF(0)))
71
 
        error = errno;
72
 
      if (info->dfile >= 0 && internal::my_close(info->dfile,MYF(0)))
73
 
        error = errno;
 
69
      if (info->s->kfile >= 0 && my_close(info->s->kfile,MYF(0)))
 
70
        error = my_errno;
 
71
      if (info->dfile >= 0 && my_close(info->dfile,MYF(0)))
 
72
        error = my_errno;
74
73
      info->s->kfile=info->dfile= -1;   /* Files aren't open anymore */
75
74
      break;
76
75
#endif
79
78
      {                                 /* Open closed files */
80
79
        char name_buff[FN_REFLEN];
81
80
        if (info->s->kfile < 0)
82
 
          if ((info->s->kfile= internal::my_open(internal::fn_format(name_buff,info->filename,"",
 
81
          if ((info->s->kfile= my_open(fn_format(name_buff,info->filename,"",
83
82
                                              N_NAME_IEXT,4),info->mode,
84
83
                                    MYF(MY_WME))) < 0)
85
 
            error = errno;
 
84
            error = my_errno;
86
85
        if (info->dfile < 0)
87
86
        {
88
 
          if ((info->dfile= internal::my_open(internal::fn_format(name_buff,info->filename,"",
 
87
          if ((info->dfile= my_open(fn_format(name_buff,info->filename,"",
89
88
                                              N_NAME_DEXT,4),info->mode,
90
89
                                    MYF(MY_WME))) < 0)
91
 
            error = errno;
 
90
            error = my_errno;
92
91
          info->rec_cache.file=info->dfile;
93
92
        }
94
93
      }
96
95
      if (info->was_locked)
97
96
      {
98
97
        if (mi_lock_database(info, info->was_locked))
99
 
          error=errno;
 
98
          error=my_errno;
100
99
        info->was_locked=0;
101
100
      }
102
101
      break;
106
105
  pthread_mutex_unlock(&THR_LOCK_myisam);
107
106
  if (!error)
108
107
    return(0);
109
 
  return(errno=error);
 
108
  return(my_errno=error);
110
109
} /* mi_panic */