merge from 5.1-mtr

client/mysqltest.cc

@@ -8032,13 +8032,15 @@ int main(int argc, char **argv)
     cur_file->lineno= 1;
   }
   init_re();
+
+  /* Cursor protcol implies ps protocol */
+  if (cursor_protocol)
+    ps_protocol= 1;
+
   ps_protocol_enabled= ps_protocol;
   sp_protocol_enabled= sp_protocol;
   view_protocol_enabled= view_protocol;
   cursor_protocol_enabled= cursor_protocol;
-  /* Cursor protcol implies ps protocol */
-  if (cursor_protocol_enabled)
-    ps_protocol_enabled= 1;
 
   st_connection *con= connections;
   if (!( mysql_init(&con->mysql)))

mysql-test/include/not_crashrep.inc

+# 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
+}

mysql-test/suite/binlog/t/binlog_index.test

@@ -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');

mysql-test/suite/innodb/t/innodb_bug53756.test

@@ -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.
 #

mysql-test/suite/innodb_plugin/t/innodb_bug53756.test

@@ -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.
 #

mysql-test/t/crash_commit_before.test

 -- 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

mysql-test/t/myisam_crash_before_flush_keys.test

@@ -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,