summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2011-03-01 15:54:21 +0200
committerunknown <timour@askmonty.org>2011-03-01 15:54:21 +0200
commit71e9d9489556f04ce22ffa924bcdd512f82caa85 (patch)
tree8e495932b6729ac9c05a454991aaf79352da7520 /sql/filesort.cc
parent7895c35874c76a88d7b1be609f06fbe6f266aab7 (diff)
parentc6ba9598026b06f5d64e7508abb652ac22d50e48 (diff)
downloadmariadb-git-71e9d9489556f04ce22ffa924bcdd512f82caa85.tar.gz
MWL#89
Merge 5.3 into 5.3-mwl89.
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 65e4116479c..2b39e74b8cb 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -1239,7 +1239,7 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file,
QUEUE queue;
qsort2_cmp cmp;
void *first_cmp_arg;
- element_count dupl_count;
+ element_count dupl_count= 0;
uchar *src;
THD::killed_state not_killable;
uchar *unique_buff= param->unique_buff;