← Back to branch summary

~drizzle-pbxt/drizzle/drizzle-pbxt-2

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_locking.cc

  • Committer: Paul McCullagh
  • Date: 2009-11-10 14:18:39 UTC
  • mfrom: (1038.1.7 drizzle-pbxt-pre-merge)
  • Revision ID: paul.mccullagh@primebase.org-20091110141839-2j3k43b17ag6f605
Merged Drizzle trunk and PBXT 1.0.09

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_locking.cc
20
20
  isamdatabase.
21
21
*/
22
22
 
23
 
#include "myisamdef.h"
 
23
#include "myisam_priv.h"
24
24
#include <mystrings/m_ctype.h>
25
25
#include <mysys/my_tree.h>
26
26
#include <drizzled/util/test.h>
99
99
          if (mi_state_info_write(share->kfile, &share->state, 1))
100
100
            error=my_errno;
101
101
          share->changed=0;
102
 
          if (myisam_flush)
103
 
          {
104
 
            if (my_sync(share->kfile, MYF(0)))
105
 
              error= my_errno;
106
 
            if (my_sync(info->dfile, MYF(0)))
107
 
              error= my_errno;
108
 
          }
109
 
          else
110
 
            share->not_flushed=1;
 
102
          share->not_flushed=1;
111
103
          if (error)
112
104
          {
113
105
            mi_print_error(info->s, HA_ERR_CRASHED);
390
382
      share->state.update_count= info->last_loop= ++info->this_loop;
391
383
      if ((error=mi_state_info_write(share->kfile, &share->state, 1)))
392
384
        olderror=my_errno;
393
 
#ifdef __WIN__
394
 
      if (myisam_flush)
395
 
      {
396
 
        _commit(share->kfile);
397
 
        _commit(info->dfile);
398
 
      }
399
 
#endif
400
385
    }
401
386
    my_errno=olderror;
402
387
  }