Manual merge.

sql/sql_parse.cc

@@ -1429,7 +1429,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
       break;
     general_log_print(thd, command, NullS);
 #ifndef DBUG_OFF
-    DBUG_EXECUTE_IF("simulate_detached_thread_refresh",
+    bool debug_simulate= FALSE;
+    DBUG_EXECUTE_IF("simulate_detached_thread_refresh", debug_simulate= TRUE;);
+    if (debug_simulate)
     {
       /*
         Simulate a reload without a attached thread session.
@@ -1444,9 +1446,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
       my_pthread_setspecific_ptr(THR_THD, thd);
       if (!res)
         my_ok(thd);
-                      goto end;
+      break;
     }
-                    );
 #endif
     if (!reload_acl_and_cache(thd, options, NULL, &not_used))
       my_ok(thd);
@@ -1591,11 +1592,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
     break;
   }
 
-  /* Break the switch for DBUG wrapped code. */
-#ifndef DBUG_OFF
-end:
-#endif
-
   /* report error issued during command execution */
   if (thd->killed_errno())
   {