← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.h

  • Committer: Mark Atwood
  • Date: 2011-04-29 00:19:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2297.
  • Revision ID: me@mark.atwood.name-20110429001938-ps5i74hzcic7dvr3
Merge in Fixes of Brian's IOCACHE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.h
42
42
  ha_rows find_all_keys(SortParam *param, 
43
43
                        optimizer::SqlSelect *select,
44
44
                        unsigned char **sort_keys,
45
 
                        internal::IO_CACHE *buffpek_pointers,
46
 
                        internal::IO_CACHE *tempfile, internal::IO_CACHE *indexfile);
 
45
                        internal::io_cache_st *buffpek_pointers,
 
46
                        internal::io_cache_st *tempfile, internal::io_cache_st *indexfile);
47
47
 
48
 
  int merge_buffers(SortParam *param,internal::IO_CACHE *from_file,
49
 
                    internal::IO_CACHE *to_file, unsigned char *sort_buffer,
 
48
  int merge_buffers(SortParam *param,internal::io_cache_st *from_file,
 
49
                    internal::io_cache_st *to_file, unsigned char *sort_buffer,
50
50
                    buffpek *lastbuff,
51
51
                    buffpek *Fb,
52
52
                    buffpek *Tb,int flag);
55
55
                  unsigned char *sort_buffer,
56
56
                  buffpek *buffpek,
57
57
                  uint32_t maxbuffer,
58
 
                  internal::IO_CACHE *tempfile,
59
 
                  internal::IO_CACHE *outfile);
 
58
                  internal::io_cache_st *tempfile,
 
59
                  internal::io_cache_st *outfile);
60
60
 
61
61
  int merge_many_buff(SortParam *param, unsigned char *sort_buffer,
62
62
                      buffpek *buffpek,
63
 
                      uint32_t *maxbuffer, internal::IO_CACHE *t_file);
 
63
                      uint32_t *maxbuffer, internal::io_cache_st *t_file);
64
64
 
65
 
  uint32_t read_to_buffer(internal::IO_CACHE *fromfile, buffpek *buffpek,
 
65
  uint32_t read_to_buffer(internal::io_cache_st *fromfile, buffpek *buffpek,
66
66
                          uint32_t sort_length);
67
67
 
68
68