bzr push into mysql-trunk branch (gleb.shchepa:3780 to 3781) WL#5855

[Gleb Shchepa]

 3781 Gleb Shchepa	2012-05-03
      WL#5855: Print EXPLAIN in JSON format
      
      Minor update to make old Sun C++ compiler happy.

    modified:
      sql/sql_executor.cc
 3780 Frazer Clement	2012-05-03
      Second part of not removing MySQL Cluster binary man pages

    modified:
      man/CMakeLists.txt
=== modified file 'sql/sql_executor.cc'
--- a/sql/sql_executor.cc	2012-04-26 10:33:24 +0000
+++ b/sql/sql_executor.cc	2012-05-03 10:57:53 +0000
@@ -229,9 +229,9 @@ JOIN::exec()
       */
       init_items_ref_array();
 
-      ORDER_with_src tmp_group= 
-        (!simple_group && !procedure && !(test_flags & TEST_NO_KEY_GROUP)) ? 
-        group_list : NULL;
+      ORDER_with_src tmp_group;
+      if (!simple_group && !procedure && !(test_flags & TEST_NO_KEY_GROUP))
+        tmp_group= group_list;
       
       tmp_table_param.hidden_field_count= 
         all_fields.elements - fields_list.elements;

No bundle (reason: useless for push emails).