diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 03:18:14 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 03:18:14 +0200 |
| commit | 8e15768731c52b6bbb29d7bfe27bdd71c025a3a3 (patch) | |
| tree | 3148e77619dba81f92ab25d604079b46689e58b8 /sql/filesort.cc | |
| parent | ebb8c9fb26f86cff8c0d81bd2415f415cef952bb (diff) | |
| parent | 66744f4540c464413055a79111c34449e8381618 (diff) | |
| download | mariadb-git-8e15768731c52b6bbb29d7bfe27bdd71c025a3a3.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 917b9de6038..23674b937fc 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1639,7 +1639,7 @@ int merge_buffers(Sort_param *param, IO_CACHE *from_file, if (!(error= (int) read_to_buffer(from_file, buffpek, rec_length))) { - queue_remove(&queue,0); + (void) queue_remove_top(&queue); reuse_freed_buff(&queue, buffpek, rec_length); } else if (error == -1) |