database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

4.1 -> 5.0 merge

Browse Source
This commit is contained in:
monty@mysql.com
2005-02-03 13:18:30 +02:00
parent 12bf600d18 e7450d9781
commit 422c2eb868
54 changed files with 471 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@@ -1435,7 +1435,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)