← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_sort.h

  • Committer: Lee Bieber
  • Date: 2010-11-05 20:22:41 UTC
  • mfrom: (1907.1.2 build)
  • Revision ID: kalebral@gmail.com-20101105202241-1fm31t0y0fvdwcd3
Merge Brian - Adding FileSort class, merge in catalog tree
Merge Joe - fix bug 670971: InnoDB does not complete shutdown with transaction log enabled

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_sort.h
126
126
 
127
127
typedef class sort_param SORTPARAM;
128
128
 
129
 
 
130
 
int merge_many_buff(SORTPARAM *param, unsigned char *sort_buffer,
131
 
                    buffpek *buffpek,
132
 
                    uint32_t *maxbuffer, internal::IO_CACHE *t_file);
133
 
 
134
 
uint32_t read_to_buffer(internal::IO_CACHE *fromfile, buffpek *buffpek,
135
 
                        uint32_t sort_length);
136
 
 
137
 
int merge_buffers(SORTPARAM *param,internal::IO_CACHE *from_file,
138
 
                  internal::IO_CACHE *to_file, unsigned char *sort_buffer,
139
 
                  buffpek *lastbuff,
140
 
                  buffpek *Fb,
141
 
                  buffpek *Tb,int flag);
142
 
 
143
129
} /* namespace drizzled */
144
130
 
145
131
#endif /* DRIZZLED_SQL_SORT_H */