bzr push into mysql-trunk branch (jon.hauglid:3573 to 3574)

[Jon Olav Hauglid]

 3574 Jon Olav Hauglid	2011-11-08
      Fix gcc 4.6.1 compilation error:
      error: variable ‘info’ set but not used

    modified:
      sql/mdl.cc
 3573 Tor Didriksen	2011-11-08
      Bug#11748783 37359: FILESORT CAN BE MORE EFFICIENT
      
      Post-push fix: sort_buffer_size depends on platform (32 vs 64 bit)

    modified:
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
=== modified file 'sql/mdl.cc'
--- a/sql/mdl.cc	2011-10-11 04:27:52 +0000
+++ b/sql/mdl.cc	2011-11-08 09:59:12 +0000
@@ -92,7 +92,7 @@ void MDL_key::init_psi_keys()
 {
   int i;
   int count;
-  PSI_stage_info *info;
+  PSI_stage_info *info __attribute__((unused));
 
   count= array_elements(MDL_key::m_namespace_to_wait_state_name);
   for (i= 0; i<count; i++)

No bundle (reason: useless for push emails).