bzr push into mysql-trunk branch (roy.lyseng:4015 to 4016) WL#5561

[Roy Lyseng]

 4016 Roy Lyseng	2012-05-31
      WL#5561 - Fixing a (bogus) compiler warning.

    modified:
      sql/sql_optimizer.cc
 4015 Vasil Dimov	2012-05-31
      part of WL#6189 Turn InnoDB persistent statistics ON by default
      
      Adjust mtr tests, part 19.
      
      Persistent stats use a different sampling algorithm so it is possible
      that the stats numbers differ from transient stats.
      
      Also, persistent stats are updated less frequently or with a delay, so
      it is possible that persistent stats are not up to date as transient were
      even if both algorithms would return the same results.
      
      If possible, each failing test was fixed by manually running ANALYZE TABLE.
      This is doable if both transient and persistent sampling algorithms end up
      with the same numbers for the given table and its data.
      
      If persistent stats result in different stats, then test failures were fixed
      by forcing the usage of transient stats for the table by using
      CREATE TABLE ... STATS_PERSISTENT=0.
      
      Intentionally do not fix the tests by using persistent stats and adjustin
      the output of EXPLAIN in .result files because a different execution plan
      may cause a different code path to be executed, than the one originally
      intended in the test.

    modified:
      mysql-test/include/mix2.inc
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/t/innodb.test
=== modified file 'sql/sql_optimizer.cc'
--- a/sql/sql_optimizer.cc	2012-05-31 14:28:35 +0000
+++ b/sql/sql_optimizer.cc	2012-05-31 20:51:27 +0000
@@ -2838,7 +2838,7 @@ void JOIN::set_prefix_tables()
   */
   table_map current_tables_map= const_table_map | OUTER_REF_TABLE_BIT;
   table_map prev_tables_map= (table_map) 0;
-  table_map saved_tables_map;
+  table_map saved_tables_map= (table_map) 0;
 
   JOIN_TAB *last_non_sjm_tab= NULL; // Track the last non-sjm table
 

No bundle (reason: useless for push emails).