bzr push into mysql-5.5 branch (tor.didriksen:3999 to 4000)

[Tor Didriksen]

 4000 Tor Didriksen	2012-10-01 [merge]
      merge 5.1 => 5.5

    modified:
      sql/sql_lex.cc
 3999 Joerg Bruehe	2012-10-01 [merge]
      Empty upmerge of 5.1.66 into 5.5

=== modified file 'sql/sql_lex.cc'
--- a/sql/sql_lex.cc	2012-04-21 10:24:39 +0000
+++ b/sql/sql_lex.cc	2012-10-01 13:57:37 +0000
@@ -1760,6 +1760,7 @@ void st_select_lex::init_query()
   ref_pointer_array= 0;
   select_n_where_fields= 0;
   select_n_having_items= 0;
+  n_child_sum_items= 0;
   subquery_in_having= explicit_limit= 0;
   is_item_list_lookup= 0;
   first_execution= 1;

No bundle (reason: useless for push emails).