fixup! ff2c481c

sql/log_event.cc

@@ -1185,6 +1185,7 @@ Log_event* Log_event::read_log_event(const uchar *buf, uint event_len,
       break;
     case EXEC_LOAD_EVENT:
       ev= new Execute_load_log_event(buf, event_len, fdle);
+      set_orig_exec_time_in_thd(((Query_log_event*) ev)->exec_time);
       break;
     case START_EVENT_V3: /* this is sent only by MySQL <=4.x */
       ev= new Start_log_event_v3(buf, event_len, fdle);

sql/rpl_parallel.cc

@@ -60,7 +60,11 @@ rpt_handle_event(rpl_parallel_thread::queued_event *qev,
   rgi->future_event_relay_log_pos= qev->future_event_relay_log_pos;
   strcpy(rgi->future_event_master_log_name, qev->future_event_master_log_name);
   if (event_can_update_last_master_timestamp(ev))
+  {
     rgi->last_master_timestamp= ev->when + (time_t)ev->exec_time;
+    thd->orig_exec_time= ev->exec_time;
+  }
+
   err= apply_event_and_update_pos_for_parallel(ev, thd, rgi);
 
   rli->executed_entries++;

sql/slave.cc

@@ -3482,7 +3482,6 @@ void store_master_info(THD *thd, Master_info *mi, TABLE *table,
                        String *gtid_pos)
 {
   Field **field= table->field;
-  uint i=0;
   const char *msg;
   Rpl_filter *rpl_filter= mi->rpl_filter;
   StringBuffer<256> tmp;
@@ -3695,7 +3694,7 @@ void store_master_info(THD *thd, Master_info *mi, TABLE *table,
   if (mi->rli.newest_master_timestamp)
     (*field++)->store_timestamp((my_time_t) mi->rli.newest_master_timestamp, 0);
   else
-    field[i++]->set_null();
+    (*field++)->set_null();
 
   if (mi->rli.slave_timestamp)
   {
@@ -3705,7 +3704,7 @@ void store_master_info(THD *thd, Master_info *mi, TABLE *table,
                               mi->rli.slave_timestamp), true);
   }
   else
-    field[i++]->set_null();
+    (*field++)->set_null();
 
   mysql_mutex_unlock(&mi->rli.err_lock);
   mysql_mutex_unlock(&mi->err_lock);

sql/sql_class.h

@@ -2930,7 +2930,7 @@ class THD: public THD_count, /* this must be first */
   ulonglong  start_utime, utime_after_lock, utime_after_query;
   /* This can be used by handlers to send signals to the SQL level */
   ulonglong  replication_flags;
-  my_time_t orig_exec_time= 0;       // Exec time for last read binlog event
+  my_time_t orig_exec_time;         // Exec time for last read binlog event
   // Process indicator
   struct {
     /*