diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-03-15 16:11:17 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-03-15 16:11:17 +0100 |
| commit | 160a26dafe709e9ac82ffcfa0077fa2bbf15d77f (patch) | |
| tree | 516a850887c024cd849cb67af2902ae6f394dd2b /mysql-test/t | |
| parent | b506fdfca39e3ccfd1ef31e696b41e69e3515727 (diff) | |
| parent | ebba068d26115f6d65ca12163bb771b56003edd5 (diff) | |
| download | mariadb-git-160a26dafe709e9ac82ffcfa0077fa2bbf15d77f.tar.gz | |
upmerge 11762804
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/crash_commit_before.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/myisam_crash_before_flush_keys.test | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/crash_commit_before.test b/mysql-test/t/crash_commit_before.test index e3dba58d4df..6e36d2345e1 100644 --- a/mysql-test/t/crash_commit_before.test +++ b/mysql-test/t/crash_commit_before.test @@ -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 diff --git a/mysql-test/t/myisam_crash_before_flush_keys.test b/mysql-test/t/myisam_crash_before_flush_keys.test index 0b0491098cd..a9f36f40d10 100644 --- a/mysql-test/t/myisam_crash_before_flush_keys.test +++ b/mysql-test/t/myisam_crash_before_flush_keys.test @@ -10,6 +10,8 @@ call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:"); call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc let $MYSQLD_DATADIR= `select @@datadir`; SET GLOBAL delay_key_write=ALL; |