diff options
| author | unknown <hf@deer.(none)> | 2003-06-25 17:16:53 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-25 17:16:53 +0500 |
| commit | 349946b370944bad6ee9aa24e9ad3e138d2aeffe (patch) | |
| tree | 2981074647633880c26b0927616e00b382ffd920 /sql/sql_select.cc | |
| parent | 9354da219c43de2286faada566a2ad415a9310ef (diff) | |
| parent | 8abad215650386dedf0001812f44859009de74ef (diff) | |
| download | mariadb-git-349946b370944bad6ee9aa24e9ad3e138d2aeffe.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.674
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 67bec77e245..e03b007f8b7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -453,6 +453,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, goto err; thd->proc_info="preparing"; + + select_distinct= select_distinct && (join.const_tables != join.tables); + if (result->initialize_tables(&join)) goto err; if (join.const_table_map != join.found_const_table_map && |