summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2001-06-07 14:10:58 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2001-06-07 14:10:58 +0300
commit823586b2c755a6a64861b7a8e292baf4750f6ee2 (patch)
treedd2be2dec43e6f6be30389e81bd803459d639fb6 /sql/filesort.cc
parent4e886689b2095185cd675ec88f4e40f77b6074b1 (diff)
downloadmariadb-git-823586b2c755a6a64861b7a8e292baf4750f6ee2.tar.gz
Enhancing both multi-table delete and division of LEX
sql/filesort.cc: removing of some extra comments sql/sql_class.h: Clear division between new and old stripping code sql/sql_delete.cc: Stripping of unnecessary code and making it more efficient sql/sql_parse.cc: Better split of LEX into two and enhancements in multi table delete sql/sql_yacc.yy: More efficient division of LEX and optional syntax in multi - table delete sql/uniques.cc: fixing some additional bugs
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index d0146e5e56a..76f6bc4c33c 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -739,7 +739,6 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file,
buffpek=(BUFFPEK*) queue_top(&queue);
if (cmp) // Remove duplicates
{
-// Was if (!cmp(&sort_length, param->unique_buff, (uchar**) buffpek->key))
if (!cmp(&sort_length, &(param->unique_buff), (uchar**) &buffpek->key))
goto skip_duplicate;
memcpy(param->unique_buff, (uchar*) buffpek->key,sort_length);