diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /sql/sql_sort.h | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
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); |