1 files changed, 9 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index d6223453a5b..f3e08f14213 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -3962,7 +3962,15 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli,
       */
       if (!(ev->is_artificial_event() || ev->is_relay_log_event() || (ev->when == 0)))
       {
-        rli->last_master_timestamp= ev->when + (time_t) ev->exec_time;
+        /*
+          Ignore FD's timestamp as it does not reflect the slave execution
+          state but likely to reflect a deep past. Consequently when the first
+          data modification event execution last long all this time
+          Seconds_Behind_Master is zero.
+        */
+        if (ev->get_type_code() != FORMAT_DESCRIPTION_EVENT)
+          rli->last_master_timestamp= ev->when + (time_t) ev->exec_time;
+
         DBUG_ASSERT(rli->last_master_timestamp >= 0);
       }
     }