Merge branch '10.0-galera' into 10.1

1 files changed, 7 insertions, 0 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 87f0926ad9a..1027a8b102d 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4377,6 +4377,7 @@ handler::ha_create_partitioning_metadata(const char *name,
   DBUG_ASSERT(m_lock_type == F_UNLCK ||
               (!old_name && strcmp(name, table_share->path.str)));
 
+
   return create_partitioning_metadata(name, old_name, action_flag);
 }
 
@@ -6168,6 +6169,12 @@ void ha_fake_trx_id(THD *thd)
     DBUG_VOID_RETURN;
   }
 
+  if (thd->wsrep_ws_handle.trx_id != WSREP_UNDEFINED_TRX_ID)
+  {
+    WSREP_DEBUG("fake trx id skipped: %lu", thd->wsrep_ws_handle.trx_id);
+    DBUG_VOID_RETURN;
+  }
+
   /* Try statement transaction if standard one is not set. */
   THD_TRANS *trans= (thd->transaction.all.ha_list) ?  &thd->transaction.all :
     &thd->transaction.stmt;