bzr push into mysql-5.6-wl6494 branch (marko.makela:4347 to 4348) WL#6494

[marko.makela]

 4348 Marko Mäkelä	2012-10-01
      WL#6494 Solaris DBUG_SUICIDE fix.
      
      On Solaris, DBUG_SUICIDE returns 0 instead of 128+SIGKILL.
      RECOVERY_CRASH(): Use exit(3) instead of DBUG_SUICIDE.
      (The Windows version of DBUG_SUICIDE does exit(3).)

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size.test
      storage/innobase/srv/srv0start.cc
 4347 Marko Mäkelä	2012-09-28
      WL#6494 test case fix: Suppress gcov failure, skip test with 2M log size.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size-1.test
=== modified file 'mysql-test/suite/innodb/t/innodb-log-file-size.test'
--- a/mysql-test/suite/innodb/t/innodb-log-file-size.test	revid:marko.makela@strippedu6em4v256jb23
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size.test	revid:marko.makela@stripped50-hpfk6n1tc6m5we1w
@@ -73,18 +73,18 @@ let SEARCH_PATTERN= syntax error in inno
 
 # On Windows, DBUG_SUICIDE() does exit(3) instead of SIGKILL (128+9).
 --echo --innodb-force-recovery-crash=1
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=1
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=2
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=2
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
 --echo --innodb-force-recovery-crash=3
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=3
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
@@ -99,7 +99,7 @@ let SEARCH_PATTERN= InnoDB: Can.t initia
 --remove_file $SEARCH_FILE
 
 --echo --innodb-force-recovery-crash=4
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=4
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
@@ -107,7 +107,7 @@ let SEARCH_PATTERN= InnoDB: Resizing red
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=5
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=5
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
@@ -122,7 +122,7 @@ let SEARCH_PATTERN= InnoDB: Can.t initia
 --remove_file $SEARCH_FILE
 
 --echo --innodb-force-recovery-crash=6
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=6
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
@@ -130,7 +130,7 @@ let SEARCH_PATTERN= InnoDB: Resizing red
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=7
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=7
 # this crashes right after deleting all log files
 --remove_file $SEARCH_FILE
@@ -142,13 +142,13 @@ let SEARCH_PATTERN= InnoDB: Cannot creat
 --remove_file $SEARCH_FILE
 
 --echo --innodb-force-recovery-crash=8
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=8
 let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=9
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=9
 let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc
@@ -194,7 +194,7 @@ let SEARCH_PATTERN= InnoDB: Log file .*i
 --move_file $MYSQLD_DATADIR/ib_logfile1_hidden $MYSQLD_DATADIR/ib_logfile1
 
 --echo --innodb-force-recovery-crash=10
---error 3,137
+--error 3
 --exec $MYSQLD_CMD $crash=10
 let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc

=== modified file 'storage/innobase/srv/srv0start.cc'
--- a/storage/innobase/srv/srv0start.cc	revid:[e-mail]-20120928104428-57lu6em4v256jb23
+++ b/storage/innobase/srv/srv0start.cc	revid:marko.makela@stripped21001073450-hpfk6n1tc6m5we1w
@@ -549,7 +549,14 @@ create_log_file(
 #ifdef DBUG_OFF
 # define RECOVERY_CRASH(x) do {} while(0)
 #else
-# define RECOVERY_CRASH(x) if (srv_force_recovery_crash == x) DBUG_SUICIDE()
+# define RECOVERY_CRASH(x) do {						\
+	if (srv_force_recovery_crash == x) {				\
+		fprintf(stderr, "innodb_force_recovery_crash=%lu\n",	\
+			srv_force_recovery_crash);			\
+		fflush(stderr);						\
+		exit(3);						\
+	}								\
+} while (0)
 #endif
 
 /*********************************************************************//**

No bundle (reason: useless for push emails).