diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-06-03 17:07:26 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-06-03 17:07:26 +0300 |
| commit | 4e886689b2095185cd675ec88f4e40f77b6074b1 (patch) | |
| tree | 117457cc851c63311919cde097c85f86ae4d9995 /sql/filesort.cc | |
| parent | 020160f83f62d6171c57a4021e21e68049c2a4e8 (diff) | |
| download | mariadb-git-4e886689b2095185cd675ec88f4e40f77b6074b1.tar.gz | |
These are actually two changesets. One for splitting LEX in two and
the other for multi-table delete
sql/filesort.cc:
Fixed some bugs for Unique class
sql/item.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/item_sum.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/mysql_priv.h:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_class.h:
Adding multi table delete
sql/sql_delete.cc:
Added multi-table delete
sql/sql_lex.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_lex.h:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_parse.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc, plus added multi-table delete
sql/sql_select.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_update.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_yacc.yy:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc, plus added multi-table delete
sql/uniques.cc:
Fixed some bugs in duplicate stripping
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index e5e6c7d97c8..d0146e5e56a 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -739,7 +739,8 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file, buffpek=(BUFFPEK*) queue_top(&queue); if (cmp) // Remove duplicates { - if (!cmp(&sort_length, param->unique_buff, (uchar*) buffpek->key)) +// 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); } |