diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 08:59:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 08:59:03 +0300 |
| commit | b61700c22104b513caa9a85e5c6529aa5f2bf4e4 (patch) | |
| tree | 23f776bd41e4388241ebb43eb8102ca6d36d1b4a /sql/filesort.cc | |
| parent | 70df2bef7acffed1e7da21ba7b9c644a32e36f3a (diff) | |
| parent | 725e47bfb524f4b1d29076c8777056bedd5f00ea (diff) | |
| download | mariadb-git-b61700c22104b513caa9a85e5c6529aa5f2bf4e4.tar.gz | |
Merge 10.0 into 10.1
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 23674b937fc..3f174029d48 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -925,6 +925,7 @@ write_keys(Sort_param *param, Filesort_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 */ |