3885 Hemant Kumar 2012-04-17
In order to reduce test execution time on daily valgrind, I have just disabled the test execution of some selected tests on daily valgrind only.
modified:
mysql-test/suite/engines/funcs/t/crash_manytables_number.test
mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test
mysql-test/suite/engines/funcs/t/se_join_cross.test
mysql-test/suite/engines/funcs/t/se_join_default.test
mysql-test/suite/engines/funcs/t/se_join_inner.test
mysql-test/suite/engines/funcs/t/se_join_left.test
mysql-test/suite/engines/funcs/t/se_join_natural_left.test
mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test
mysql-test/suite/engines/funcs/t/se_join_natural_right.test
mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test
mysql-test/suite/engines/funcs/t/se_join_right.test
mysql-test/suite/engines/funcs/t/se_join_right_outer.test
mysql-test/suite/engines/funcs/t/se_join_straight.test
mysql-test/suite/engines/funcs/t/se_string_limit.test
mysql-test/suite/engines/iuds/t/update_delete_number.test
mysql-test/suite/innodb/t/innodb_bug30423.test
mysql-test/suite/innodb/t/innodb_bug53290.test
mysql-test/suite/parts/t/partition_float_myisam.test
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
mysql-test/suite/rpl/t/rpl_parallel_innodb.test
mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test
mysql-test/suite/rpl/t/rpl_row_img_blobs.test
mysql-test/suite/rpl/t/rpl_row_img_eng_full.test
mysql-test/suite/rpl/t/rpl_row_img_idx_full.test
mysql-test/suite/rpl/t/rpl_stop_slave.test
mysql-test/suite/rpl/t/rpl_typeconv.test
mysql-test/t/index_merge_innodb.test
mysql-test/t/innodb_explain_json_non_select_all.test
mysql-test/t/innodb_explain_non_select_all.test
mysql-test/t/innodb_explain_non_select_none.test
mysql-test/t/mysql_client_test_embedded.test
3884 Georgi Kodinov 2012-04-17 [merge]
empty merge of a version bump
=== modified file 'mysql-test/suite/engines/funcs/t/crash_manytables_number.test'
--- a/mysql-test/suite/engines/funcs/t/crash_manytables_number.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/crash_manytables_number.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test'
--- a/mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_cross.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_cross.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_cross.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_default.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_default.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_default.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_inner.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_inner.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_inner.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_left.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_left.test 2011-01-05 08:43:46 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_left.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_natural_left.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_natural_left.test 2011-01-05 08:43:46 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_natural_left.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test 2011-01-05 08:43:46 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_natural_right.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_natural_right.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_natural_right.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_right.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_right.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_right.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_right_outer.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_right_outer.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_right_outer.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_join_straight.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_straight.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_straight.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;
--enable_warnings
=== modified file 'mysql-test/suite/engines/funcs/t/se_string_limit.test'
--- a/mysql-test/suite/engines/funcs/t/se_string_limit.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_string_limit.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
=== modified file 'mysql-test/suite/engines/iuds/t/update_delete_number.test'
--- a/mysql-test/suite/engines/iuds/t/update_delete_number.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/iuds/t/update_delete_number.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
--disable_warnings
DROP TABLE IF EXISTS t1,t2;
--enable_warnings
=== modified file 'mysql-test/suite/innodb/t/innodb_bug30423.test'
--- a/mysql-test/suite/innodb/t/innodb_bug30423.test 2011-11-20 21:00:25 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug30423.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
# Test for Bug #30423, InnoDBs treatment of NULL in index stats causes
# bad "rows examined" estimates.
# Implemented InnoDB system variable "innodb_stats_method" with
=== modified file 'mysql-test/suite/innodb/t/innodb_bug53290.test'
--- a/mysql-test/suite/innodb/t/innodb_bug53290.test 2010-06-07 10:37:11 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug53290.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
-- source include/have_innodb.inc
create table bug53290 (x bigint) engine=innodb;
=== modified file 'mysql-test/suite/parts/t/partition_float_myisam.test'
--- a/mysql-test/suite/parts/t/partition_float_myisam.test 2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_float_myisam.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
################################################################################
# t/partition_float_myisam.test #
# #
=== modified file 'mysql-test/suite/rpl/t/rpl_innodb_bug28430.test'
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test 2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
--source include/have_innodb.inc
--source include/have_partition.inc
--source include/have_binlog_format_mixed_or_row.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_innodb.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_innodb.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
#
# WL#5569 MTS
#
=== modified file 'mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test'
--- a/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test 2011-12-06 00:32:36 +0000
+++ b/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
#
# Bug#11763573 - 56299: MUTEX DEADLOCK WITH COM_BINLOG_DUMP, BINLOG PURGE, AND PROCESSLIST/KILL
#
=== modified file 'mysql-test/suite/rpl/t/rpl_row_img_blobs.test'
--- a/mysql-test/suite/rpl/t/rpl_row_img_blobs.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_img_blobs.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
#
# This file contains tests for WL#5096.
#
=== modified file 'mysql-test/suite/rpl/t/rpl_row_img_eng_full.test'
--- a/mysql-test/suite/rpl/t/rpl_row_img_eng_full.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_img_eng_full.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
#
# This file contains tests for WL#5096 and bug fixes.
#
=== modified file 'mysql-test/suite/rpl/t/rpl_row_img_idx_full.test'
--- a/mysql-test/suite/rpl/t/rpl_row_img_idx_full.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_img_idx_full.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
#
# This file contains tests for WL#5096.
#
=== modified file 'mysql-test/suite/rpl/t/rpl_stop_slave.test'
--- a/mysql-test/suite/rpl/t/rpl_stop_slave.test 2012-03-06 14:29:42 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
source include/master-slave.inc;
source include/have_innodb.inc;
source include/have_debug.inc;
=== modified file 'mysql-test/suite/rpl/t/rpl_typeconv.test'
--- a/mysql-test/suite/rpl/t/rpl_typeconv.test 2011-09-07 10:08:09 +0000
+++ b/mysql-test/suite/rpl/t/rpl_typeconv.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
--source include/have_binlog_format_row.inc
--source include/master-slave.inc
=== modified file 'mysql-test/t/index_merge_innodb.test'
--- a/mysql-test/t/index_merge_innodb.test 2011-11-03 07:01:49 +0000
+++ b/mysql-test/t/index_merge_innodb.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
# t/index_merge_innodb.test
#
# Index merge tests
=== modified file 'mysql-test/t/innodb_explain_json_non_select_all.test'
--- a/mysql-test/t/innodb_explain_json_non_select_all.test 2012-02-29 11:17:52 +0000
+++ b/mysql-test/t/innodb_explain_json_non_select_all.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
#
# Run explain_non_select.inc on InnoDB with all of the so-called 6.0 features.
#
=== modified file 'mysql-test/t/innodb_explain_non_select_all.test'
--- a/mysql-test/t/innodb_explain_non_select_all.test 2012-02-29 11:17:52 +0000
+++ b/mysql-test/t/innodb_explain_non_select_all.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
#
# Run explain_non_select.inc on InnoDB with all of the so-called 6.0 features.
#
=== modified file 'mysql-test/t/innodb_explain_non_select_none.test'
--- a/mysql-test/t/innodb_explain_non_select_none.test 2012-02-29 11:17:52 +0000
+++ b/mysql-test/t/innodb_explain_non_select_none.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
#
# Run explain_non_select.inc on InnoDB without any of the socalled 6.0 features.
#
=== modified file 'mysql-test/t/mysql_client_test_embedded.test'
--- a/mysql-test/t/mysql_client_test_embedded.test 2012-02-23 10:39:15 +0000
+++ b/mysql-test/t/mysql_client_test_embedded.test 2012-04-17 13:14:25 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
--source include/is_embedded.inc
--echo # Run the start/stop test 17 times (* 64 = 1088 restarts)
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (hemant.hk.kumar:3884 to 3885) | Hemant Kumar | 20 Apr |
