From: Bjorn Munch Date: January 14 2011 1:39pm Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2969) Bug#55442 List-Archive: http://lists.mysql.com/commits/128755 X-Bug: 55442 Message-Id: <201101141339.p0EDd8gq004702@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1068741370==" --===============1068741370== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/crashrep-51/ based on revid:bjorn.munch@stripped 2969 Bjorn Munch 2011-01-14 Bug #55442 mysqld debug crashes while running myisam_crash_before_flush_keys.test This will cause affected tests to skip if CrashReporter would popup Found 4 tests that needed modification added: mysql-test/include/not_crashrep.inc modified: mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/innodb/t/innodb_bug53756.test mysql-test/suite/innodb_plugin/t/innodb_bug53756.test mysql-test/t/myisam_crash_before_flush_keys.test === added file 'mysql-test/include/not_crashrep.inc' --- a/mysql-test/include/not_crashrep.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/include/not_crashrep.inc 2011-01-14 13:36:40 +0000 @@ -0,0 +1,23 @@ +# Check if CrashReporter is enabled and would open a window + +perl; +sub skip_test { + # Only relevant on Mac OS X + return 0 unless $^O eq 'darwin'; + my $crep= `defaults read com.apple.CrashReporter DialogType`; + return 0 if $?; + chomp ($crep); + return ($crep eq 'basic' || $crep eq 'developer'); +} +my $skip= skip_test(); +open (F, ">" . $ENV{'MYSQL_TMP_DIR'} . "/crashrep.inc"); +print F "let \$crashrep= $skip;\n"; +close F; +EOF + +--source $MYSQL_TMP_DIR/crashrep.inc +--remove_file $MYSQL_TMP_DIR/crashrep.inc + +if ($crashrep) { + --skip CrashReporter would popup a window +} === modified file 'mysql-test/suite/binlog/t/binlog_index.test' --- a/mysql-test/suite/binlog/t/binlog_index.test 2010-12-17 01:17:03 +0000 +++ b/mysql-test/suite/binlog/t/binlog_index.test 2011-01-14 13:36:40 +0000 @@ -6,6 +6,8 @@ source include/not_embedded.inc; # Don't test this under valgrind, memory leaks will occur --source include/not_valgrind.inc source include/have_debug.inc; +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.'); call mtr.add_suppression('MSYQL_BIN_LOG::open failed to sync the index file'); === modified file 'mysql-test/suite/innodb/t/innodb_bug53756.test' --- a/mysql-test/suite/innodb/t/innodb_bug53756.test 2010-09-30 08:28:22 +0000 +++ b/mysql-test/suite/innodb/t/innodb_bug53756.test 2011-01-14 13:36:40 +0000 @@ -17,6 +17,9 @@ # This test case needs InnoDB. --source include/have_innodb.inc +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc + # # Precautionary clean up. # === modified file 'mysql-test/suite/innodb_plugin/t/innodb_bug53756.test' --- a/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test 2010-10-03 17:39:28 +0000 +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test 2011-01-14 13:36:40 +0000 @@ -17,6 +17,9 @@ # This test case needs InnoDB. -- source include/have_innodb_plugin.inc +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc + # # Precautionary clean up. # === modified file 'mysql-test/t/myisam_crash_before_flush_keys.test' --- a/mysql-test/t/myisam_crash_before_flush_keys.test 2009-10-14 11:26:16 +0000 +++ b/mysql-test/t/myisam_crash_before_flush_keys.test 2011-01-14 13:36:40 +0000 @@ -8,6 +8,9 @@ --echo # Binary must be compiled with debug for crash to occur --source include/have_debug.inc +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc + let $MYSQLD_DATADIR= `select @@datadir`; SET GLOBAL delay_key_write=ALL; CREATE TABLE t1(a INT, --===============1068741370== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/crashrep-51/ # testament_sha1: 78541bf344346ef6db655fa9e78e174bf1d59078 # timestamp: 2011-01-14 14:39:08 +0100 # base_revision_id: bjorn.munch@stripped\ # ifv2d3zftrl521r9 # # Begin bundle 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 --===============1068741370==--