diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 0e8b191e4ef..cb056100e2a 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 &&