3788 Hemant Kumar 2012-05-04
Skiping certain tests only from daily Valgrind execution.
modified:
mysql-test/suite/engines/funcs/t/crash_manytables_string.test
mysql-test/suite/engines/funcs/t/se_join_left_outer.test
mysql-test/suite/engines/funcs/t/tc_partition_key.test
mysql-test/suite/engines/funcs/t/tc_partition_linear_key.test
mysql-test/suite/engines/iuds/t/strings_update_delete.test
mysql-test/suite/innodb/t/innodb_16k.test
mysql-test/suite/innodb/t/innodb_bug56680.test
mysql-test/suite/parts/t/rpl_partition.test
mysql-test/suite/rpl/t/rpl_check_gtid.test
mysql-test/suite/rpl/t/rpl_checksum_cache.test
mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test
mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
mysql-test/suite/rpl/t/rpl_optimize.test
mysql-test/suite/rpl/t/rpl_parallel.test
mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
mysql-test/suite/rpl/t/rpl_row_img_eng_min.test
mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test
mysql-test/suite/rpl/t/rpl_row_img_idx_min.test
mysql-test/suite/rpl/t/rpl_row_img_idx_noblob.test
mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
mysql-test/suite/rpl/t/rpl_sequential.test
mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
mysql-test/suite/stress/t/ddl_innodb.test
mysql-test/t/greedy_optimizer.test
mysql-test/t/index_merge_myisam.test
mysql-test/t/innodb_explain_json_non_select_none.test
mysql-test/t/ssl_8k_key.test
3787 Vasil Dimov 2012-05-04
Fix Bug#14007109 RECURSIVE ACQ OF BLOCK LOCK IN S MODE, STATS UPDATE
ASRT !RW_LOCK_OWN(LOCK, 352)
Manually release the latch on the last page before calling btr_pcur_close().
If that latch is not released we will stumble on the latched page upon our
next iteration on the same level which causes an assertion failure because
recursive S-latches are not allowed.
The code, roughly does this:
dict_stats_analyze_index()
start mtr
dict_stats_analyze_index_level(mtr)
traverse the level (leaves the last page in the middle level S-latched)
dict_stats_analyze_index_for_n_prefix(mtr)
traverse the level (would try to S-latch the last page)
commit mtr
Notice that if the level has just one page, then this bug does not resurface
because the pcur code always latches the first page (where opened) in X-mode
and a page left latched in X-mode is not a problem because X-mode latches are
allowed to be recursive.
Another way to fix this would be to commit the mtr in order to release the
page latch, but that will also release the tree-level S-lock and the tree may
change in between and we must take care to recognize such change.
Given that those page-level latches are acquired internally by the pcur code
and that they are released internally by the pcur code when jumping to the
next page, it makes most sense to release the latch on the current page when
closing the cursor in btr_pcur_close(). But that would require passing the
mtr to btr_pcur_close() and this function is used in lots of places. Another
consideration (raised by Marko) is that the page may contain changes in which
case the mtr should be committed instead of releasing the page latch. On the
other hand, the pcur code already releases the latches on pages it leaves.
added:
mysql-test/suite/innodb/r/innodb_bug14007109.result
mysql-test/suite/innodb/t/innodb_bug14007109.test
modified:
storage/innobase/dict/dict0stats.cc
storage/innobase/include/btr0pcur.h
storage/innobase/include/btr0pcur.ic
=== modified file 'mysql-test/suite/engines/funcs/t/crash_manytables_string.test'
--- a/mysql-test/suite/engines/funcs/t/crash_manytables_string.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/crash_manytables_string.test 2012-05-04 08:06:56 +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_left_outer.test'
--- a/mysql-test/suite/engines/funcs/t/se_join_left_outer.test 2011-01-05 08:43:46 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_join_left_outer.test 2012-05-04 08:06:56 +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/tc_partition_key.test'
--- a/mysql-test/suite/engines/funcs/t/tc_partition_key.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/tc_partition_key.test 2012-05-04 08:06:56 +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/tc_partition_linear_key.test'
--- a/mysql-test/suite/engines/funcs/t/tc_partition_linear_key.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/tc_partition_linear_key.test 2012-05-04 08:06:56 +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/strings_update_delete.test'
--- a/mysql-test/suite/engines/iuds/t/strings_update_delete.test 2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/iuds/t/strings_update_delete.test 2012-05-04 08:06:56 +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,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18;
--enable_warnings
=== modified file 'mysql-test/suite/innodb/t/innodb_16k.test'
--- a/mysql-test/suite/innodb/t/innodb_16k.test 2012-03-20 08:01:58 +0000
+++ b/mysql-test/suite/innodb/t/innodb_16k.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
# Tests for setting innodb-page-size=16k; default value
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/innodb/t/innodb_bug56680.test'
--- a/mysql-test/suite/innodb/t/innodb_bug56680.test 2011-10-05 13:14:14 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug56680.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
#
# Bug #56680 InnoDB may return wrong results from a case-insensitive index
#
=== modified file 'mysql-test/suite/parts/t/rpl_partition.test'
--- a/mysql-test/suite/parts/t/rpl_partition.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/parts/t/rpl_partition.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
--source include/have_partition.inc
--source include/have_innodb.inc
--source include/master-slave.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_check_gtid.test'
--- a/mysql-test/suite/rpl/t/rpl_check_gtid.test 2012-02-15 11:38:54 +0000
+++ b/mysql-test/suite/rpl/t/rpl_check_gtid.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
################################################################################
# This test case checks if a set of properites related to the GTIDs hold
# after rotating the binary/relay logs and after crashes. The properties
=== modified file 'mysql-test/suite/rpl/t/rpl_checksum_cache.test'
--- a/mysql-test/suite/rpl/t/rpl_checksum_cache.test 2011-03-18 13:11:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum_cache.test 2012-05-04 08:06:56 +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/master-slave.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test'
--- a/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test 2012-03-23 11:48:18 +0000
+++ b/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
# ==== Purpose ====
#
# Test that it is possible to change the topology completely randomly,
=== modified file 'mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test'
--- a/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test 2012-03-23 11:48:18 +0000
+++ b/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
###################################################################################
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
=== modified file 'mysql-test/suite/rpl/t/rpl_optimize.test'
--- a/mysql-test/suite/rpl/t/rpl_optimize.test 2012-02-09 20:26:08 +0000
+++ b/mysql-test/suite/rpl/t/rpl_optimize.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
# Test for BUG#1858 "OPTIMIZE TABLE done by a client
# thread stops the slave SQL thread".
# You can replace OPTIMIZE by REPAIR.
=== modified file 'mysql-test/suite/rpl/t/rpl_parallel.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel.test 2012-05-04 08:06:56 +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_parallel_show_binlog_events_purge_logs.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test 2012-04-20 21:25:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
# BUG#13979418: SHOW BINLOG EVENTS MAY CRASH THE SERVER
#
# The function mysql_show_binlog_events has a local stack variable
=== modified file 'mysql-test/suite/rpl/t/rpl_row_img_eng_min.test'
--- a/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test 2012-05-04 08:06:56 +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_eng_noblob.test'
--- a/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test 2012-05-04 08:06:56 +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_min.test'
--- a/mysql-test/suite/rpl/t/rpl_row_img_idx_min.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_img_idx_min.test 2012-05-04 08:06:56 +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_row_img_idx_noblob.test'
--- a/mysql-test/suite/rpl/t/rpl_row_img_idx_noblob.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_img_idx_noblob.test 2012-05-04 08:06:56 +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_row_mixing_engines.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test 2012-03-23 11:48:18 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
###################################################################################
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
=== modified file 'mysql-test/suite/rpl/t/rpl_sequential.test'
--- a/mysql-test/suite/rpl/t/rpl_sequential.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_sequential.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
#
# WL#5563 Prototype for Parallel Slave with db name partitioning.
#
=== modified file 'mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test 2012-01-11 07:29:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
###################################################################################
# This test cases evaluates the mixture of non-transactional and transcational
# tables. Specifically when drop temporary tables and create temporary tables
=== modified file 'mysql-test/suite/stress/t/ddl_innodb.test'
--- a/mysql-test/suite/stress/t/ddl_innodb.test 2007-07-13 16:32:22 +0000
+++ b/mysql-test/suite/stress/t/ddl_innodb.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
######## t/ddl_innodb.test ######
#
# Stress the storage engine InnoDB with CREATE/DROP TABLE/INDEX
=== modified file 'mysql-test/t/greedy_optimizer.test'
--- a/mysql-test/t/greedy_optimizer.test 2011-09-06 12:43:05 +0000
+++ b/mysql-test/t/greedy_optimizer.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
#
# A simple test of the greedy query optimization algorithm and the switches that
# control the optimizationprocess.
=== modified file 'mysql-test/t/index_merge_myisam.test'
--- a/mysql-test/t/index_merge_myisam.test 2009-12-22 09:35:56 +0000
+++ b/mysql-test/t/index_merge_myisam.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
# t/index_merge_myisam.test
#
# Index merge tests
=== modified file 'mysql-test/t/innodb_explain_json_non_select_none.test'
--- a/mysql-test/t/innodb_explain_json_non_select_none.test 2012-02-29 11:17:52 +0000
+++ b/mysql-test/t/innodb_explain_json_non_select_none.test 2012-05-04 08:06:56 +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/ssl_8k_key.test'
--- a/mysql-test/t/ssl_8k_key.test 2010-04-13 15:04:45 +0000
+++ b/mysql-test/t/ssl_8k_key.test 2012-05-04 08:06:56 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
-- source include/have_ssl_communication.inc
#
# Bug#29784 YaSSL assertion failure when reading 8k key.
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (hemant.hk.kumar:3787 to 3788) | Hemant Kumar | 9 May |
