bzr push into mysql-6.0-bugteam branch (joro:2967 to 2968)

[Georgi Kodinov]

 2968 Georgi Kodinov	2009-01-19
      white-space only commit (to trigger rebuild of 6.0-bugteam)
modified:
  sql/item_sum.cc

 2967 Georgi Kodinov	2009-01-19 [merge]
      merged 6.0-bugteam
modified:
  mysql-test/suite/ndb/t/disabled.def

=== modified file 'sql/item_sum.cc'
--- a/sql/item_sum.cc	2008-12-16 13:34:29 +0000
+++ b/sql/item_sum.cc	2009-01-19 17:13:28 +0000
@@ -35,7 +35,7 @@
     for a set function that are used to check validity of the set function
     occurrence.
     If the set function is not allowed in any subquery where it occurs
-    an error is reported immediately.
+    an error is reported immediately. 
 
   @param thd      reference to the thread context info