5.3->5.5 merge

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 0e0f61aedd9..6b00cd18d6e 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -159,8 +159,8 @@ public:
     null_value= 1;
   }
   /**
-    Set the subquery result to the default value for the predicate when the
-    subquery is known to produce an empty result.
+    Set the subquery result to a default value consistent with the semantics of
+    the result row produced for queries with implicit grouping.
   */
   void no_rows_in_result()= 0;
   virtual bool select_transformer(JOIN *join);