diff options
| author | unknown <serg@serg.mysql.com> | 2000-10-07 14:05:45 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-10-07 14:05:45 +0200 |
| commit | 4af074054be434b73e3b449ca1babc982c4df5fb (patch) | |
| tree | 86bb72189b916c14b9798287d813f4bac77dfb14 /sql/filesort.cc | |
| parent | c286021a376e4111a63d21b653232f80993f201b (diff) | |
| parent | aaea3431d33c9b66c6b01a31ffcd4e85a28800ee (diff) | |
| download | mariadb-git-4af074054be434b73e3b449ca1babc982c4df5fb.tar.gz | |
Merge
configure.in:
merged
BitKeeper/etc/logging_ok:
Auto merged
sql/filesort.cc:
merged
sql/sql_select.cc:
merged
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index ad17cb6aa6d..32947a06ba1 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -865,7 +865,6 @@ static int merge_index(SORTPARAM *param, uchar **sort_keys, buffpek+maxbuffer,1)) DBUG_RETURN(1); /* purecov: inspected */ DBUG_RETURN(0); - /* Was: DBUG_RETURN(my_b_write(outfile,last_ref,param->ref_length)); */ } /* merge_index */ |