From: Hemant Kumar
Date: July 13 2012 11:03am
Subject: bzr push into mysql-5.6 branch (hemant.hk.kumar:4023 to 4024)
List-Archive: http://lists.mysql.com/commits/144439
Message-Id: <20120713110353.670E96415C5@hemant-ThinkPad-T410>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4024 Hemant Kumar	2012-07-13
      After discussion with Calvin and Mattias, adding big test option for these tests-
      -mysql-test/suite/innodb/t/innodb_bug11766634.test
      -mysql-test/suite/innodb/t/innodb_bug52663.test
      -mysql-test/suite/parts/t/partition_debug_myisam.test
      -mysql-test/suite/parts/t/partition_decimal_myisam.test
      -mysql-test/suite/parts/t/partition_int_myisam.test
      -mysql-test/t/index_merge_innodb.test

    modified:
      mysql-test/suite/innodb/t/innodb_bug11766634.test
      mysql-test/suite/innodb/t/innodb_bug52663.test
      mysql-test/suite/parts/t/partition_debug_myisam.test
      mysql-test/suite/parts/t/partition_decimal_myisam.test
      mysql-test/suite/parts/t/partition_int_myisam.test
      mysql-test/t/index_merge_innodb.test
 4023 Mayank Prasad	2012-07-13
      Bug#14113704 : A STAT ON A NON EXISTING FILE CREATING A FILE RECORD IN PFS
      
      Details:
       - While doing a stat of a file, even if file doesn't exist,
         its entries are being created in performance_schema tables.
      
      Fix:
       - While collecting information about a file for which stat is
         done, if file doesn't exist, destroy its collected information.

    modified:
      include/mysql/psi/mysql_file.h
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/perfschema/t/misc.test
      mysys/psi_noop.c
      storage/perfschema/pfs.cc
      storage/perfschema/unittest/pfs-t.cc
=== modified file 'mysql-test/suite/innodb/t/innodb_bug11766634.test'
--- a/mysql-test/suite/innodb/t/innodb_bug11766634.test	2012-06-29 15:40:29 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug11766634.test	2012-07-13 11:01:37 +0000
@@ -9,6 +9,8 @@
 
 #Want to skip this test from daily Valgrind execution.
 --source include/no_valgrind_without_big.inc
+# Adding big test option for this test.
+--source include/big_test.inc
 
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc

=== modified file 'mysql-test/suite/innodb/t/innodb_bug52663.test'
--- a/mysql-test/suite/innodb/t/innodb_bug52663.test	2010-05-05 10:13:05 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug52663.test	2012-07-13 11:01:37 +0000
@@ -1,4 +1,6 @@
 --source include/have_innodb.inc
+# Adding big test option for this test.
+--source include/big_test.inc
 
 set session transaction isolation level read committed;
 

=== modified file 'mysql-test/suite/parts/t/partition_debug_myisam.test'
--- a/mysql-test/suite/parts/t/partition_debug_myisam.test	2010-12-17 12:48:18 +0000
+++ b/mysql-test/suite/parts/t/partition_debug_myisam.test	2012-07-13 11:01:37 +0000
@@ -1,5 +1,7 @@
 # Partitioning test that require debug features
 # including crashing tests.
+# Adding big test option for this test.
+--source include/big_test.inc
 
 --source include/have_debug.inc
 --source include/have_partition.inc

=== modified file 'mysql-test/suite/parts/t/partition_decimal_myisam.test'
--- a/mysql-test/suite/parts/t/partition_decimal_myisam.test	2012-03-26 11:51:27 +0000
+++ b/mysql-test/suite/parts/t/partition_decimal_myisam.test	2012-07-13 11:01:37 +0000
@@ -1,5 +1,8 @@
 #Want to skip this test from daily Valgrind execution.
 --source include/no_valgrind_without_big.inc
+# Adding big test option for this test.
+--source include/big_test.inc
+
 ################################################################################
 # t/partition_decimal_myisam.test                                              #
 #                                                                              #

=== modified file 'mysql-test/suite/parts/t/partition_int_myisam.test'
--- a/mysql-test/suite/parts/t/partition_int_myisam.test	2012-03-26 11:51:27 +0000
+++ b/mysql-test/suite/parts/t/partition_int_myisam.test	2012-07-13 11:01:37 +0000
@@ -1,5 +1,8 @@
 #Want to skip this test from daily Valgrind execution.
 --source include/no_valgrind_without_big.inc
+# Adding big test option for this test.
+--source include/big_test.inc
+
 ################################################################################
 # t/partition_int_myisam.test                                                  #
 #                                                                              #

=== modified file 'mysql-test/t/index_merge_innodb.test'
--- a/mysql-test/t/index_merge_innodb.test	2012-06-06 09:27:29 +0000
+++ b/mysql-test/t/index_merge_innodb.test	2012-07-13 11:01:37 +0000
@@ -1,5 +1,8 @@
 #Want to skip this test from daily Valgrind execution
 --source include/no_valgrind_without_big.inc
+# Adding big test option for this test.
+--source include/big_test.inc
+
 # t/index_merge_innodb.test
 #
 # Index merge tests

No bundle (reason: useless for push emails).