Merge branch '2.3' into develop

2019-01-07 10:52:07 +02:00
parent cf9ac9004e 0859f3caff
commit f0f9c21d1c
67 changed files with 777 additions and 469 deletions
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@ -205,9 +205,9 @@ void GaleraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
                info.local_state = atoi(row[1]);
            }

-            if (strcmp(row[0], "wsrep_cluster_state_uuid") == 0)
+            if (strcmp(row[0], "wsrep_cluster_state_uuid") == 0 && row[1] && *row[1])
            {
-                info.cluster_uuid = row[1] && *row[1] ? MXS_STRDUP(row[1]) : NULL;
+                info.cluster_uuid = row[1];
            }
        }