Fix for

Guilhem Bichot · Guilhem Bichot · commit bbc19d45fdfb · 2012-02-08T21:52:22.000+01:00
Bug #13688248 	CRASH IN DIAGNOSTICS_AREA::SET_OK_STATUS WHEN USING DEBUG_SYNC.
And, to test the above, I had to fix
Bug #13688015 	THE OPTION --LOOSE-DEBUG-SYNC-TIMEOUT IS PLACED WRONG
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -4865,6 +4865,14 @@ ($$$)
     mtr_add_arg($args, "--gdb");
   }
 
+  # Enable the debug sync facility, set default wait timeout.
+  # Facility stays disabled if timeout value is zero.
+  mtr_add_arg($args, "--loose-debug-sync-timeout=%s",
+              $opt_debug_sync_timeout) unless $opt_user_args;
+
+  # Options specified in .opt files should be added last so they can
+  # override defaults above.
+
   my $found_skip_core= 0;
   foreach my $arg ( @$extra_opts )
   {
@@ -4901,11 +4909,6 @@ ($$$)
     mtr_add_arg($args, "%s", "--core-file");
   }
 
-  # Enable the debug sync facility, set default wait timeout.
-  # Facility stays disabled if timeout value is zero.
-  mtr_add_arg($args, "--loose-debug-sync-timeout=%s",
-              $opt_debug_sync_timeout) unless $opt_user_args;
-
   return $args;
 }
 
diff --git a/mysql-test/r/debug_sync2.result b/mysql-test/r/debug_sync2.result
@@ -0,0 +1,13 @@
+#
+# Bug#13688248 CRASH IN DIAGNOSTICS_AREA::SET_OK_STATUS WHEN USING DEBUG_SYNC
+#
+SET SESSION DEBUG_SYNC= 'RESET';
+CREATE TABLE t1 (pk INT, PRIMARY KEY(pk));
+SET SESSION sql_mode=TRADITIONAL;
+SET SESSION autocommit=1;
+INSERT INTO t1 VALUES(1);
+SET SESSION debug_sync='write_row_replace SIGNAL go_ahead1 WAIT_FOR comes_never ';
+REPLACE INTO t1 ( pk ) VALUES ( 1 );
+Warnings:
+Warning	1639	debug sync point wait timed out
+DROP TABLE t1;
diff --git a/mysql-test/t/debug_sync2-master.opt b/mysql-test/t/debug_sync2-master.opt
@@ -0,0 +1 @@
+--loose-debug-sync-timeout=1
diff --git a/mysql-test/t/debug_sync2.test b/mysql-test/t/debug_sync2.test
@@ -0,0 +1,25 @@
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+
+--echo #
+--echo # Bug#13688248 CRASH IN DIAGNOSTICS_AREA::SET_OK_STATUS WHEN USING DEBUG_SYNC
+--echo #
+
+SET SESSION DEBUG_SYNC= 'RESET';
+
+CREATE TABLE t1 (pk INT, PRIMARY KEY(pk));
+
+connect (con1,localhost,root,,);
+connection con1;
+SET SESSION sql_mode=TRADITIONAL;
+SET SESSION autocommit=1;
+
+INSERT INTO t1 VALUES(1);
+
+connection con1;
+SET SESSION debug_sync='write_row_replace SIGNAL go_ahead1 WAIT_FOR comes_never ';
+--send
+REPLACE INTO t1 ( pk ) VALUES ( 1 );
+--reap;
+
+DROP TABLE t1;
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
@@ -1788,8 +1788,12 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
                         sig_wait, sig_glob, error));});
         if (error == ETIMEDOUT || error == ETIME)
         {
+          // We should not make the statement fail, even if in strict mode.
+          const bool save_abort_on_warning= thd->abort_on_warning;
+          thd->abort_on_warning= false;
           push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
                        ER_DEBUG_SYNC_TIMEOUT, ER(ER_DEBUG_SYNC_TIMEOUT));
+          thd->abort_on_warning= save_abort_on_warning;
           break;
         }
         error= 0;

Original file line number	Diff line number	Diff line change
`@@ -4865,6 +4865,14 @@ ($$$)`
`4865`	`4865`	`mtr_add_arg($args, "--gdb");`
`4866`	`4866`	`}`
`4867`	`4867`
	`4868`	`+ # Enable the debug sync facility, set default wait timeout.`
	`4869`	`+ # Facility stays disabled if timeout value is zero.`
	`4870`	`+ mtr_add_arg($args, "--loose-debug-sync-timeout=%s",`
	`4871`	`+ $opt_debug_sync_timeout) unless $opt_user_args;`
	`4872`	`+`
	`4873`	`+ # Options specified in .opt files should be added last so they can`
	`4874`	`+ # override defaults above.`
	`4875`	`+`
`4868`	`4876`	`my $found_skip_core= 0;`
`4869`	`4877`	`foreach my $arg ( @$extra_opts )`
`4870`	`4878`	`{`
`@@ -4901,11 +4909,6 @@ ($$$)`
`4901`	`4909`	`mtr_add_arg($args, "%s", "--core-file");`
`4902`	`4910`	`}`
`4903`	`4911`
`4904`		`- # Enable the debug sync facility, set default wait timeout.`
`4905`		`- # Facility stays disabled if timeout value is zero.`
`4906`		`- mtr_add_arg($args, "--loose-debug-sync-timeout=%s",`
`4907`		`- $opt_debug_sync_timeout) unless $opt_user_args;`
`4908`		`-`
`4909`	`4912`	`return $args;`
`4910`	`4913`	`}`
`4911`	`4914`
Original file line number	Diff line number	Diff line change
`@@ -1788,8 +1788,12 @@ static void debug_sync_execute(THD thd, st_debug_sync_action action)`
`1788`	`1788`	`sig_wait, sig_glob, error));});`
`1789`	`1789`	`if (error == ETIMEDOUT \|\| error == ETIME)`
`1790`	`1790`	`{`
	`1791`	`+ // We should not make the statement fail, even if in strict mode.`
	`1792`	`+ const bool save_abort_on_warning= thd->abort_on_warning;`
	`1793`	`+ thd->abort_on_warning= false;`
`1791`	`1794`	`push_warning(thd, Sql_condition::WARN_LEVEL_WARN,`
`1792`	`1795`	`ER_DEBUG_SYNC_TIMEOUT, ER(ER_DEBUG_SYNC_TIMEOUT));`
	`1796`	`+ thd->abort_on_warning= save_abort_on_warning;`
`1793`	`1797`	`break;`
`1794`	`1798`	`}`
`1795`	`1799`	`error= 0;`