--- ./sql/rpl_trx_tracking.cc.ORIGIN	2019-06-13 17:16:50 -0500
+++ ./sql/rpl_trx_tracking.cc	2019-06-13 17:18:14 -0500
@@ -100,7 +100,7 @@
   DBUG_ASSERT(new_val > 0);
 
   while (
-      !(cas_rc = atomic_compare_exchange_strong(&state, &old_val, new_val)) &&
+      !(cas_rc = atomic_compare_exchange_strong(&state, (int64 *)&old_val, new_val)) &&
       old_val < new_val) {
   }
 
--- ./include/mysql/plugin.h.ORIGIN	2019-06-14 12:13:34 -0500
+++ ./include/mysql/plugin.h	2019-06-14 12:14:09 -0500
@@ -404,7 +404,7 @@
       comment,                                                                 \
       check,                                                                   \
       update,                                                                  \
-      &varname,                                                                \
+      (long long int*) &varname,                                                                \
       def,                                                                     \
       min,                                                                     \
       max,                                                                     \
--- ./client/dump/abstract_progress_watcher.cc.1008     2019-12-09 20:53:17 +0100
+++ ./client/dump/abstract_progress_watcher.cc  2020-01-23 11:28:00 +0100
@@ -47,9 +47,8 @@
                  0.1);  //  Do not expand stage by more than 10 times the steps.
 
     m_step_countdown = m_last_step_countdown = std::max<int64>(
-        1,
-        ((int64)(m_last_step_countdown / stages_past) + m_last_step_countdown) /
-            2);
+        (int64) 1,
+        (int64) ((m_last_step_countdown / stages_past) + m_last_step_countdown) / 2);
     m_last_stage_time = now;
 
     uint64 stages_past_int = 1000 * std::min(stages_past, 10.0);