Merge branch '2.3' into 2.4

2020-12-11 16:38:43 +02:00
parent e3aff8babe 43068d20b4
commit 27a43fdf9d
2 changed files with 8 additions and 3 deletions
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@ -200,7 +200,11 @@ void GaleraMonitor::update_server_status(MonitorServer* monitored_server)

    /* Check if the the Galera FSM shows this node is joined to the cluster */
    const char* cluster_member =
-        "SHOW STATUS WHERE Variable_name IN"
+        " SELECT * FROM ("
+        " SELECT * FROM information_schema.SESSION_STATUS"
+        " UNION"
+        " SELECT * FROM information_schema.SESSION_VARIABLES) AS t"
+        " WHERE Variable_name IN"
        " ('wsrep_cluster_state_uuid',"
        " 'wsrep_cluster_size',"
        " 'wsrep_local_index',"