List:Commits« Previous MessageNext Message »
From:Tanjot Uppal Date:November 6 2012 6:47am
Subject:bzr push into mysql-trunk branch (tanjot.uppal:4911 to 4912)
View as plain text  
 4912 Tanjot Uppal	2012-11-06
      To add a weekly MTR run with Query Cache disabled on trunk on PB2.

    added:
      mysql-test/include/have_QC_Disabled.inc
    modified:
      mysql-test/collections/default.weekly
      mysql-test/suite/perfschema/t/aggregate.test
      mysql-test/suite/perfschema/t/event_aggregate.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_u.test
      mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
      mysql-test/suite/perfschema/t/nesting.test
      mysql-test/suite/perfschema/t/view_table_io.test
 4911 Shivji Kumar Jha	2012-11-06 [merge]
      BUG#14666177 - TIME DIFF BETWEEN LAST 2 RECONNECTS IS
                     COMING > @@GLOBAL.NET_READ_TIMEOUT * 2 
      
        merge from 5.6 into trunk

    modified:
      mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
      mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
=== modified file 'mysql-test/collections/default.weekly'
--- a/mysql-test/collections/default.weekly	2012-10-09 11:57:27 +0000
+++ b/mysql-test/collections/default.weekly	2012-11-06 06:45:03 +0000
@@ -64,3 +64,7 @@ perl mysql-test-run.pl --debug-server --
 # Additional run to test rpl HASH_SCAN & INDEX_SCAN
 perl mysql-test-run.pl --force --debug-server --timer --parallel=auto --experimental=collections/default.experimental --comment=binlog_rpl_row_hash_scan --vardir=var-binlog_rpl_row_hash_scan --mysqld=--binlog-format=row --suite=binlog,rpl --mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN --big-test --testcase-timeout=60
 perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=rpl_binlog_row_hash_MTS --vardir=var-mts-rpl-binlog-hash-n_mix --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl,binlog  -mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN
+
+#Run with Query Cache Enabled
+
+perl mysql-test-run.pl --timer --force --big-test --parallel=auto --comment=Query_Cache_Enabled --vardir=var-QC_Enabled --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--query_cache_type=1 --mysqld=--query_cache_size=1M

=== added file 'mysql-test/include/have_QC_Disabled.inc'
--- a/mysql-test/include/have_QC_Disabled.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/have_QC_Disabled.inc	2012-11-06 06:45:03 +0000
@@ -0,0 +1,5 @@
+let $QC_check = `SELECT @@GLOBAL.query_cache_type = 'ON'`;
+if ( $QC_check == 1 )
+{
+   --skip Test requires: Query Cache to be disabled
+}

=== modified file 'mysql-test/suite/perfschema/t/aggregate.test'
--- a/mysql-test/suite/perfschema/t/aggregate.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/aggregate.test	2012-11-06 06:45:03 +0000
@@ -1,6 +1,9 @@
 # Tests for PERFORMANCE_SCHEMA
 # Verify that statistics aggregated by different criteria are consistent.
 
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
+
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 

=== modified file 'mysql-test/suite/perfschema/t/event_aggregate.test'
--- a/mysql-test/suite/perfschema/t/event_aggregate.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/event_aggregate.test	2012-11-06 06:45:03 +0000
@@ -1,6 +1,7 @@
 # Tests for the performance schema
 #
-
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc

=== modified file 'mysql-test/suite/perfschema/t/event_aggregate_no_a.test'
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_a.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a.test	2012-11-06 06:45:03 +0000
@@ -1,5 +1,7 @@
 # Tests for the performance schema
 #
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
 
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc

=== modified file 'mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test'
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test	2012-11-06 06:45:03 +0000
@@ -1,5 +1,7 @@
 # Tests for the performance schema
 #
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
 
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc

=== modified file 'mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test'
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test	2012-11-06 06:45:03 +0000
@@ -1,5 +1,7 @@
 # Tests for the performance schema
 #
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
 
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc

=== modified file 'mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test'
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test	2012-11-06 06:45:03 +0000
@@ -1,5 +1,7 @@
 # Tests for the performance schema
 #
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
 
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc

=== modified file 'mysql-test/suite/perfschema/t/event_aggregate_no_h.test'
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_h.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_h.test	2012-11-06 06:45:03 +0000
@@ -1,5 +1,7 @@
 # Tests for the performance schema
 #
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
 
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc

=== modified file 'mysql-test/suite/perfschema/t/event_aggregate_no_u.test'
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_u.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_u.test	2012-11-06 06:45:03 +0000
@@ -1,5 +1,7 @@
 # Tests for the performance schema
 #
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
 
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc

=== modified file 'mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test'
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test	2012-11-06 06:45:03 +0000
@@ -1,5 +1,7 @@
 # Tests for the performance schema
 #
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
 
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc

=== modified file 'mysql-test/suite/perfschema/t/nesting.test'
--- a/mysql-test/suite/perfschema/t/nesting.test	2011-11-28 11:16:00 +0000
+++ b/mysql-test/suite/perfschema/t/nesting.test	2012-11-06 06:45:03 +0000
@@ -1,5 +1,8 @@
 # Test to check the proper nesting of events
 
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
+
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 # On windows, the socket instrumentation collects an extra "opt"

=== modified file 'mysql-test/suite/perfschema/t/view_table_io.test'
--- a/mysql-test/suite/perfschema/t/view_table_io.test	2011-10-19 21:49:22 +0000
+++ b/mysql-test/suite/perfschema/t/view_table_io.test	2012-11-06 06:45:03 +0000
@@ -3,6 +3,9 @@
 #       base table used within the view shows up whereas
 #       the view itself never shows up.
 
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+-- source include/have_QC_Disabled.inc
+
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 --source ../include/table_io_setup_helper.inc

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tanjot.uppal:4911 to 4912) Tanjot Uppal6 Nov