Merge commit '09cb4a885f88d30b5108d215dcdaa5163229a230' into develop

2019-04-04 14:34:17 +03:00
parent f812302d62 09cb4a885f
commit 2aa3515fc8
92 changed files with 1560 additions and 1696 deletions
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@ -972,7 +972,7 @@ bool RWSplitSession::should_migrate_trx(RWBackend* target)

 bool RWSplitSession::start_trx_migration(RWBackend* target, GWBUF* querybuf)
 {
-    MXS_INFO("Starting transaction migration from '%s' to '%s'", m_current_master->name(), target->name());
+    MXS_INFO("Starting transaction migration to '%s'", target->name());

    /**
     * Stash the current query so that the transaction replay treats