Commit f8166357 authored by Bjorn Munch's avatar Bjorn Munch

merge from 5.5-mtr

parents 53486e71 356a8031
...@@ -8334,13 +8334,15 @@ int main(int argc, char **argv) ...@@ -8334,13 +8334,15 @@ int main(int argc, char **argv)
} }
var_set_string("MYSQLTEST_FILE", cur_file->file_name); var_set_string("MYSQLTEST_FILE", cur_file->file_name);
init_re(); init_re();
/* Cursor protcol implies ps protocol */
if (cursor_protocol)
ps_protocol= 1;
ps_protocol_enabled= ps_protocol; ps_protocol_enabled= ps_protocol;
sp_protocol_enabled= sp_protocol; sp_protocol_enabled= sp_protocol;
view_protocol_enabled= view_protocol; view_protocol_enabled= view_protocol;
cursor_protocol_enabled= cursor_protocol; cursor_protocol_enabled= cursor_protocol;
/* Cursor protcol implies ps protocol */
if (cursor_protocol_enabled)
ps_protocol_enabled= 1;
st_connection *con= connections; st_connection *con= connections;
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
......
# 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);
$crep= lc $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
}
...@@ -6,6 +6,8 @@ source include/not_embedded.inc; ...@@ -6,6 +6,8 @@ source include/not_embedded.inc;
# Don't test this under valgrind, memory leaks will occur # Don't test this under valgrind, memory leaks will occur
--source include/not_valgrind.inc --source include/not_valgrind.inc
source include/have_debug.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('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::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'); call mtr.add_suppression('MSYQL_BIN_LOG::open failed to sync the index file');
......
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
# This test case needs InnoDB. # This test case needs InnoDB.
-- source include/have_innodb.inc -- source include/have_innodb.inc
# Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc
# #
# Precautionary clean up. # Precautionary clean up.
# #
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
--source include/not_valgrind.inc --source include/not_valgrind.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/not_crashrep.inc
call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001"); call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
......
-- source include/not_embedded.inc -- source include/not_embedded.inc
# Don't test this under valgrind, memory leaks will occur # Don't test this under valgrind, memory leaks will occur
--source include/not_valgrind.inc --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 # Binary must be compiled with debug for crash to occur
--source include/have_debug.inc --source include/have_debug.inc
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:"); 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"); 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`; let $MYSQLD_DATADIR= `select @@datadir`;
SET GLOBAL delay_key_write=ALL; SET GLOBAL delay_key_write=ALL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment