diff options
| author | Michael Widenius <monty@mariadb.org> | 2018-04-12 09:28:29 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-05-07 00:07:33 +0300 |
| commit | a0bc3b7eeef6a3bfd0e7eae1cceabcc73071a61a (patch) | |
| tree | 5ee70953aa35c648bbc0c7c9f252bc23d7df1acd /sql/sql_sort.h | |
| parent | 062a3176e7d985540e1051a35f15c313c0296b47 (diff) | |
| download | mariadb-git-a0bc3b7eeef6a3bfd0e7eae1cceabcc73071a61a.tar.gz | |
Change read_to_buffer to use ulong instead of uint
This is mostly to document that read_to_buffer can read more than 65K.
Also changed merge_buffers to return bool instead of int
Diffstat (limited to 'sql/sql_sort.h')
| -rw-r--r-- | sql/sql_sort.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_sort.h b/sql/sql_sort.h index d57239671a8..c29bf1440c9 100644 --- a/sql/sql_sort.h +++ b/sql/sql_sort.h @@ -100,12 +100,12 @@ public: int merge_many_buff(Sort_param *param, uchar *sort_buffer, BUFFPEK *buffpek, uint *maxbuffer, IO_CACHE *t_file); -uint read_to_buffer(IO_CACHE *fromfile,BUFFPEK *buffpek, - uint sort_length); -int merge_buffers(Sort_param *param,IO_CACHE *from_file, - IO_CACHE *to_file, uchar *sort_buffer, - BUFFPEK *lastbuff,BUFFPEK *Fb, - BUFFPEK *Tb,int flag); +ulong read_to_buffer(IO_CACHE *fromfile,BUFFPEK *buffpek, + uint sort_length); +bool merge_buffers(Sort_param *param,IO_CACHE *from_file, + IO_CACHE *to_file, uchar *sort_buffer, + BUFFPEK *lastbuff,BUFFPEK *Fb, + BUFFPEK *Tb,int flag); int merge_index(Sort_param *param, uchar *sort_buffer, BUFFPEK *buffpek, uint maxbuffer, IO_CACHE *tempfile, IO_CACHE *outfile); |