merge bug14597605 to the main repo.

sql/log_event.h

@@ -2508,7 +2508,7 @@ class User_var_log_event: public Log_event
      and which case the applier adjusts execution path.
   */
   bool is_deferred() { return deferred; }
-  void set_deferred() { deferred= val; }
+  void set_deferred() { deferred= true; }
 #endif
   bool is_valid() const { return 1; }