Use DBUG_EXECUTE_IF on DEBUG_SYNC timeout, instead of DBUG_ASSERT.

Marko M&auml;kel&auml; · Marko M&auml;kel&auml; · commit d10a0740120e · 2012-03-21T16:06:19.000+02:00
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
@@ -1794,7 +1794,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
           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;
-          DBUG_ASSERT(0);
+          DBUG_EXECUTE_IF("debug_sync_abort_on_timeout", DBUG_ABORT(););
           break;
         }
         error= 0;

Original file line number	Diff line number	Diff line change
`@@ -1794,7 +1794,7 @@ static void debug_sync_execute(THD thd, st_debug_sync_action action)`
`1794`	`1794`	`push_warning(thd, Sql_condition::WARN_LEVEL_WARN,`
`1795`	`1795`	`ER_DEBUG_SYNC_TIMEOUT, ER(ER_DEBUG_SYNC_TIMEOUT));`
`1796`	`1796`	`thd->abort_on_warning= save_abort_on_warning;`
`1797`		`- DBUG_ASSERT(0);`
	`1797`	`+ DBUG_EXECUTE_IF("debug_sync_abort_on_timeout", DBUG_ABORT(););`
`1798`	`1798`	`break;`
`1799`	`1799`	`}`
`1800`	`1800`	`error= 0;`