List:Commits« Previous MessageNext Message »
From:marko.makela Date:May 15 2012 11:31am
Subject:bzr push into mysql-trunk branch (marko.makela:3837 to 3838) Bug#13875241
View as plain text  
 3838 Marko Mäkelä	2012-05-15
      Bug#13875241 Nondeterminism in innodb-index-online.test
      
      Adjust the replace_regexp for the record counts.
      This was forgotten last time when the test output was modified.

    modified:
      mysql-test/suite/innodb/t/innodb-index-online.test
 3837 Georgi Kodinov	2012-05-15 [merge]
      merge

    modified:
      config.h.cmake
      configure.cmake
      include/mysql/psi/mysql_file.h
      include/mysql/psi/mysql_idle.h
      include/mysql/psi/mysql_socket.h
      include/mysql/psi/mysql_stage.h
      include/mysql/psi/mysql_statement.h
      include/mysql/psi/mysql_table.h
      include/mysql/psi/mysql_thread.h
      include/mysql/psi/psi.h
      mysql-test/valgrind.supp
      mysys/my_thr_init.c
      sql/handler.cc
      sql/mysqld.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_table.cc
      sql/table.cc
      storage/innobase/include/os0file.h
      storage/innobase/include/os0sync.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0rw.ic
      storage/innobase/include/sync0sync.ic
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_account.cc
      storage/perfschema/pfs_account.h
      storage/perfschema/pfs_digest.cc
      storage/perfschema/pfs_digest.h
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_events_waits.cc
      storage/perfschema/pfs_global.cc
      storage/perfschema/pfs_global.h
      storage/perfschema/pfs_host.cc
      storage/perfschema/pfs_host.h
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_instr_class.cc
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/pfs_server.cc
      storage/perfschema/pfs_setup_actor.cc
      storage/perfschema/pfs_setup_actor.h
      storage/perfschema/pfs_setup_object.cc
      storage/perfschema/pfs_setup_object.h
      storage/perfschema/pfs_user.cc
      storage/perfschema/pfs_user.h
      storage/perfschema/pfs_visitor.cc
      storage/perfschema/table_esgs_global_by_event_name.cc
      storage/perfschema/table_esms_global_by_event_name.cc
=== modified file 'mysql-test/suite/innodb/t/innodb-index-online.test'
--- a/mysql-test/suite/innodb/t/innodb-index-online.test	revid:georgi.kodinov@oracle.com-20120515103817-twb7spws9y4hmuli
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test	revid:marko.makela@oracle.com-20120515113019-546xz9tu9c7d7fdd
@@ -169,7 +169,7 @@ INSERT INTO t1 SELECT 10 + c1, c2, c3 FR
 INSERT INTO t1 SELECT 20 + c1, c2, c3 FROM t1;
 INSERT INTO t1 SELECT 40 + c1, c2, c3 FROM t1;
 # Purge may or may not have cleaned up the DELETE FROM t1 WHERE c1 = 7;
---replace_result 6 5
+--replace_result 81 80
 EXPLAIN SELECT COUNT(*) FROM t1 WHERE c2 > 3;
 ANALYZE TABLE t1;
 
@@ -188,6 +188,8 @@ DROP TABLE t1_c2_stats;
 CREATE INDEX c2d ON t1(c2);
 # This should show the newly calculated stats by CREATE INDEX above,
 # not the faked cardinality=4 for c2d(c2).
+# Purge may or may not have cleaned up the DELETE FROM t1 WHERE c1 = 7;
+--replace_result 81 80
 SHOW INDEX FROM t1;
 EXPLAIN SELECT COUNT(*) FROM t1 WHERE c2 > 3;
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:3837 to 3838) Bug#13875241marko.makela15 May