diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 11:09:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 11:09:47 +0300 |
| commit | 8f643e2063c9890a353149f39ef85b2cf3151fd0 (patch) | |
| tree | c5468b905c8858dc1cc80ccb2072a923b28c8783 /sql/filesort.cc | |
| parent | 3aecedb2f8f99c446a5ba0b02efcf422a252c9e8 (diff) | |
| parent | b61700c22104b513caa9a85e5c6529aa5f2bf4e4 (diff) | |
| download | mariadb-git-8f643e2063c9890a353149f39ef85b2cf3151fd0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index baeb75b3b0b..5d5b210e62d 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -951,6 +951,7 @@ write_keys(Sort_param *param, SORT_INFO *fs_info, uint count, /* check we won't have more buffpeks than we can possibly keep in memory */ if (my_b_tell(buffpek_pointers) + sizeof(BUFFPEK) > (ulonglong)UINT_MAX) goto err; + bzero(&buffpek, sizeof(buffpek)); buffpek.file_pos= my_b_tell(tempfile); if ((ha_rows) count > param->max_rows) count=(uint) param->max_rows; /* purecov: inspected */ |