← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_cache.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-07-30 02:39:13 UTC
  • mto: (1115.3.11 captain)
  • mto: This revision was merged to the branch mainline in revision 1121.
  • Revision ID: osullivan.padraig@gmail.com-20090730023913-o2zuocp32l6btnc2
Removing references to MY_BITMAP throughout the code base and updating calls
to MyBitmap in various places to use the new interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_cache.cc
15
15
 
16
16
/* Open a temporary file and cache it with io_cache. Delete it on close */
17
17
 
18
 
#include "config.h"
19
 
 
20
 
#include "drizzled/internal/my_sys.h"
21
 
#include "drizzled/internal/m_string.h"
22
 
#include "drizzled/internal/my_static.h"
23
 
#include "drizzled/internal/iocache.h"
24
 
#include "drizzled/error.h"
25
 
 
26
 
namespace drizzled
27
 
{
28
 
namespace internal
29
 
{
 
18
#include "mysys/mysys_priv.h"
 
19
#include <mystrings/m_string.h>
 
20
#include <mysys/my_static.h>
 
21
#include <mysys/mysys_err.h>
 
22
#include <mysys/iocache.h>
 
23
 
30
24
 
31
25
        /*
32
26
        ** Open tempfile cached by IO_CACHE
75
69
{
76
70
  if (my_b_inited(cache))
77
71
  {
78
 
    int file=cache->file;
 
72
    File file=cache->file;
79
73
    cache->file= -1;                            /* Don't flush data */
80
74
    (void) end_io_cache(cache);
81
75
    if (file >= 0)
94
88
  }
95
89
  return;
96
90
}
97
 
 
98
 
} /* namespace internal */
99
 
} /* namespace drizzled */