From: Jonas Oreland
Date: February 1 2012 12:00pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4841 to 4842)
List-Archive: http://lists.mysql.com/commits/142931
Message-Id: <20120217084014.3261255C19B@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4842 Jonas Oreland	2012-02-01
      ndb - forgot to update ndb_index_stat/ndb_index_stat_restart which also uses ndb_index_stat_enable.inc

    modified:
      mysql-test/suite/ndb/t/ndb_index_stat.test
      mysql-test/suite/ndb/t/ndb_index_stat_restart.test
 4841 Jonas Oreland	2012-02-01 [merge]
      ndb - merge index_stat test fixes

    modified:
      mysql-test/suite/ndb/r/ndb_statistics0.result
      mysql-test/suite/ndb/r/ndb_statistics1.result
      mysql-test/suite/ndb/t/ndb_index_stat_enable.inc
      mysql-test/suite/ndb/t/ndb_statistics.inc
      mysql-test/suite/ndb/t/ndb_statistics0.test
      mysql-test/suite/ndb/t/ndb_statistics1.test
=== modified file 'mysql-test/suite/ndb/t/ndb_index_stat.test'
--- a/mysql-test/suite/ndb/t/ndb_index_stat.test	2011-11-19 07:56:25 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index_stat.test	2012-02-01 11:59:01 +0000
@@ -19,6 +19,7 @@ DROP TABLE IF EXISTS t1, t2;
 --enable_warnings
 
 set @is_enable_default = @@global.ndb_index_stat_enable;
+let is_table_exists = `select count(*) <> 2 from information_schema.tables where table_name in ('ndb_index_stat_head', 'ndb_index_stat_sample') and table_schema='mysql'`;
 
 set @is_enable = 1;
 source ndb_index_stat_enable.inc;

=== modified file 'mysql-test/suite/ndb/t/ndb_index_stat_restart.test'
--- a/mysql-test/suite/ndb/t/ndb_index_stat_restart.test	2011-11-30 12:39:03 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index_stat_restart.test	2012-02-01 11:59:01 +0000
@@ -6,6 +6,7 @@ DROP TABLE IF EXISTS t1;
 --enable_warnings
 
 set @is_enable_default = @@global.ndb_index_stat_enable;
+let is_table_exists = `select count(*) <> 2 from information_schema.tables where table_name in ('ndb_index_stat_head', 'ndb_index_stat_sample') and table_schema='mysql'`;
 
 set @is_enable = 1;
 source ndb_index_stat_enable.inc;

No bundle (reason: useless for push emails).