From: vasil.dimov
Date: May 31 2012 9:43pm
Subject: bzr push into mysql-trunk branch (vasil.dimov:4016 to 4017) WL#6189
List-Archive: http://lists.mysql.com/commits/144065
Message-Id: <20120531214347.3D82E2E0BE@mail.v5d.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4017 Vasil Dimov	2012-06-01
      part of WL#6189 Turn InnoDB persistent statistics ON by default
      
      Adjust mtr tests, part 20.
      
      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/subquery_sj.inc
 4016 Roy Lyseng	2012-05-31
      WL#5561 - Fixing a (bogus) compiler warning.

    modified:
      sql/sql_optimizer.cc
=== modified file 'mysql-test/include/subquery_sj.inc'
--- a/mysql-test/include/subquery_sj.inc	revid:roy.lyseng@stripped
+++ b/mysql-test/include/subquery_sj.inc	revid:vasil.dimov@stripped
@@ -5640,6 +5640,14 @@ INSERT INTO t3 (col_varchar_key) VALUES
  ('c'), ('c'), ('q'), ('g'), ('e'), ('l'), (NULL), ('c'), ('h'), ('d'),
  ('c'), ('i'), ('t'), ('g'), ('q'), ('l'), ('n'), ('z'), ('n'), ('r'), ('p');
 
+-- disable_query_log
+-- disable_result_log
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+ANALYZE TABLE t3;
+-- enable_result_log
+-- enable_query_log
+
 CREATE VIEW v1 AS
 SELECT table2.col_varchar_nokey AS field1
 FROM t2 AS table1
@@ -6050,6 +6058,13 @@ INSERT INTO t2 (col_int_nokey, col_time_
  (9, '15:02:08', '15:02:08'), (5, '23:59:59', '23:59:59'),
  (0, '08:23:30', '08:23:30'), (3, '08:32:22', '08:32:22');
 
+-- disable_query_log
+-- disable_result_log
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+-- enable_result_log
+-- enable_query_log
+
 let $query=
 SELECT ot1.col_int_key AS x
 FROM t1 AS ot2

No bundle (reason: useless for push emails).