diff options
author | bell@sanja.is.com.ua <> | 2005-02-01 11:05:29 +0200 |
---|---|---|
committer | bell@sanja.is.com.ua <> | 2005-02-01 11:05:29 +0200 |
commit | 48da18cd45cabe33db27938f9917b9247c3b25de (patch) | |
tree | b629002da53b22fca92236e5c9434ff87b1ec628 /sql/sql_select.cc | |
parent | de16b5f48f0f30660f5df6c5269f1536fc5bf7e5 (diff) | |
parent | 0bf6e3aefc60adf8de12f5954812764a06495af1 (diff) | |
download | mariadb-git-48da18cd45cabe33db27938f9917b9247c3b25de.tar.gz |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ccfcb213068..8353ca9333d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1320,7 +1320,7 @@ JOIN::exec() curr_join->select_distinct=0; /* Each row is unique */ curr_join->join_free(0); /* Free quick selects */ - if (select_distinct && ! group_list) + if (curr_join->select_distinct && ! curr_join->group_list) { thd->proc_info="Removing duplicates"; if (curr_join->tmp_having) |