diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-02-01 11:05:29 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-02-01 11:05:29 +0200 |
| commit | 9fe76ad98bb536990cafbfcaef3942ceba7981a6 (patch) | |
| tree | b629002da53b22fca92236e5c9434ff87b1ec628 /sql/sql_select.cc | |
| parent | 99620cecd8eb66ffdc21c4569cb86900f311548d (diff) | |
| parent | 755c9aabe27eaf0587b6f8331e1d688e855e6ed1 (diff) | |
| download | mariadb-git-9fe76ad98bb536990cafbfcaef3942ceba7981a6.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
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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) |