From: Bjorn Munch Date: March 15 2011 1:55pm Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2987) Bug#11762804 List-Archive: http://lists.mysql.com/commits/133029 X-Bug: 11762804 Message-Id: <201103151356.p2FDu1o8022157@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1649074495==" --===============1649074495== 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 2987 Bjorn Munch 2011-03-15 Bug #11762804 55442: MYSQLD DEBUG CRASHES WHILE RUNNING MYISAM_CRASH_BEFORE_FLUSH_KEYS.TEST This will cause affected tests to skip if CrashReporter would popup Found 5 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/crash_commit_before.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-03-15 13:54:45 +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-03-15 13:54:45 +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-03-15 13:54:45 +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-03-15 13:54:45 +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/crash_commit_before.test' --- a/mysql-test/t/crash_commit_before.test 2007-12-12 17:19:24 +0000 +++ b/mysql-test/t/crash_commit_before.test 2011-03-15 13:54:45 +0000 @@ -1,6 +1,8 @@ -- source include/not_embedded.inc # Don't test this under valgrind, memory leaks will occur --source include/not_valgrind.inc +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc # Binary must be compiled with debug for crash to occur --source include/have_debug.inc === 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-03-15 13:54:45 +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, --===============1649074495== 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: 165dd1ed804bf486bec7fb6a349cdce25f78b303 # timestamp: 2011-03-15 14:56:01 +0100 # base_revision_id: bjorn.munch@stripped\ # 00p2o4cjduuq8y42 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTrPFC0ABOrfgAAQXOf////v /+X////+YAm8rvu5bQANAGYozWWTNYaAoMJJETRgmmQFT9kZSn4p6U9R6mg/SgeU/U0yZQaNlP1P VDjI0yYmgyZMJpkDIaA0Bpk0MAJoDEFQaY1NGmjag0aGgBoAAAAABoBIkSn6JTPVPFNmSJvU0mjI NDJ6Q00ANAAAHGRpkxNBkyYTTIGQ0BoDTJoYATQGEkgIAJhAmQaNJip+im1PUB6gAAAMnlW//r8Z mu3K2yuAb+Ob+M+JojE6bX6/ppDnrWA6WtFiUOeOrajTZ9eaxASaD62Kjz7+S7qMrt2InQilcX68 NI2NnpdF2mvz84fM+XPn9beii0aWslq2pa0aEMzDDDMhs1l9kv3OtnVZtGEbjChBOJDTMNyMHZZV 9tNWIjED4iN4qiGMjpiBHxOQ2UbpxGKbJvBGWg/TgOMumnu0kAH/vTc6E4oydT3iukhoRgJw5FdU 1FL5/8w8KYgqC5vUgkJfb+XZu29DNM7seF+xg7CH2QuogE7BBvfRgy4xFmB8gBsFyChLm+7htUzV 80182srLcCzbv5baMWcN7i03uJSw1F2M/I460BCuGkFMu2boB3Qg4y0sW7S6ugJPticae3eyU4+W bQTmy87qq6qYEkY0hwkVeuH3Ok94wWCljEXQ8LE9DK9UfClCbFyNHuSGZqSYyRA1DUDc1mUSSSZ4 GGYr3hm9IqqSDcR3FQ+RCQ45DwcxxCQ8e4cqiBAsawZFai6TQHiIKdET0Ocih1BGig2D1IuomAVh dilixJqptJFUFl+4qsAtG+ym6AkcjL6TQjBMX3OXzl1o2xucVlI20i667TbeX4GezKvUA0fSBC0e DiJ3ZfkAMC4Ask9xnVEcz8YbzKJ56kzy0cGqhjCgqV2QrTBjYFNRrOAPPL5PuMd4zGZRpWQIVchI IEjI7B4BvyVhQM4rk+Q6AYwr+o6gjDMvnVKpnEyZftegsHjNDKi8b4H2/cOImiqKKPRcfHNR2um2 ecrFfQVrOmZmNVFTockGwhMi4puepDzGZ2FABQPG5jjshibbbx4thYZOxbzpxzLjALCBWQ2Gcjmf AfOPO1YPOI1ZcBEzoek80+CgQHhJxkOAPCcQCkhX0XjbXuKR1lAmbclXIiZnmn0EsBsAIowC4tLC It55JTQ60olAKSGY1vcATJbuMdC7mcxQKxtQCulG5okCJfxHnQuFIxOw7PKk6upqGNhkakDwvHmY MaGkDaYR2at5nF95QLTePeZmBZWTlCugujhCJImYDzttJlRRz0mTOJyJ3RcRHbS7soAeVkjrgOMR w46n1LS3fIpbIvXaOWHAgUAG8bG+8skqbBn1Fr3lXbFKZHYw+wvH7nGd4FAxXV22GBUZO4ldsacL BqYtE0roISn5jTIG+PEyNS5UD9hRuMnGJCzOBM2WGpKBI0MWXlRGRiysThxebhkmkOc20iRm9QyY zJjigvM5ku4Aq3lRuj0MyVeZoPKMTOBweZ7EcKnipg90E8jqNmEpwA6nNKKINaVI6OTx/7VhIyvZ 0akoW/csbbbN0WmUmMhNtgYugT4OjgNTBFnFy8pjRKqEMmGZjh2m0he3tYD4s9M7jFvoj/r4fGfv k7mmowevyq5MTPxL54OXrtcqVOezGej0opMOLm0l45LEF9cjLDagvvpvTErwhwWVLN316dWOgpkY HemXWVw/NRPwL6lmUXcJy4VMCZwNQ2DGZFVJBwxNJT4irGvJ4B0EvQYD3ExwP1PGAw5BfgYfFJEZ Qe4o4DimG8gyLyHqUWWG9x/fZiwpLynvoSyz52PfibtMm3yj7yI8DWUxl4sPAeVEAHDwKToNf2Cg OPiPp4o7yFJhO5Smkn2fQXsxWLolJHzQDOJseh56lGYxhXuNDAKdDeFx5kjgXWHHHr3DzE2ipOFt egCqqYvV9D3JI1kL+gBiOABWPQrmtw0cc5owG2SR2OnadW3Gic2YJz9u8NTmbTXlwIR7ybFVtJWB wrAeOHwQtNPDzqqcKozjFprNWoUR8NEmFbelKbrgKX4TSq91g4TkV7B4CZhORtMZvvTX9d/rnijt 1XFpWOIM5YRi6hUlbHuydoP93YizQcX+W2g9jC+NlU87XaW17Ou45tJoOuKto64qa9xn163f94M9 7vOKUkmmBnGIPEgmsmwgpk25ZZ2OzDRkogG1E07IQNSQvlVrBnCzHcSO4v7jUkSOzgcz19ZeJmWW FxQMBIwgsEo+LvvfIXgLsE/bv8LBRMe083e3AA5ch6UUduwRLp5HWsY4mhwBoNRV0fyRQCRMAMwl lfVxnrKACv37Z6M084lbqQqOkay6PxlwZ4KC2xGa5Caya6hi4B9pKkHHuzNaWpI6UkXoIUzFwhn4 TU29n39nr123oNgWAzDr37le3oN6gGeLpqsvyKuI+4kXC+JGYs3jywjOsZ57HOBc5BiLxDYOGvtB 4D3HoMcpHsarBLDBJDhVMLDr3V+pnvJ87IUBOuWfqZozpkLu695nrbzJm6bktiBMLvMzWZ9ktFsL AcKm/Ms/qd4YlQdNzqqUs/vntH1Ejwp5enaRmDp5WsbHic//EIcoiQ6cGmQFNcVEimRiRAnECUqo rqgOhpbqVqNhm9641uEOYDaOW7TgWsuliXDL16IYXIANeFu0TAVM+jhGl/kl9qSMEGKDtSRAQ9Sz GxA49T4r+OIpacDm7N1Y5yHCT5IPorhxKIyy6MJgJpfG9atz1vLKUq0DsSV9dVm32tS6nuWL0Le8 sTcCeZoL0NXFxlZ4DGbAfYypO7YAGP0QdAR2GQoi4GdiSkdGZCZ0Fv4OS7+/TH5cXH47lemSR8jl Od/UkgpbBlXtpTHZJ/edSUl8SVF8MTS+1JRetrBiKaSog35Cqz84zkMouyzjy0F3Q7zbtylwqlsn YwgigZcsLPaPBtxrTS516C5gqT7vA8vhy9yripgUCq+IJgaHe3qgzu3oZhe4chmBN3uttox1IQPa V6DBXjVvKngOv1XjA945dypF894ux8jBVYv+shIjjolHqoC3qiq1OIcTn7ZwarNZFRBB4fwRL1KC Z5AFGzgyPoe+tq1LDYPQqfQic5lcWOS0UFfcfnmlhFuAHgGhxnyAD2uSpMJIRz5Tnyd1Hd/4u5Ip woSB1nihaA== --===============1649074495==--