--- db_mysql_re_grt.py.orig	2015-05-10 14:00:23.776496420 +0200
+++ db_mysql_re_grt.py	2015-05-10 14:01:12.188311597 +0200
@@ -62,7 +62,7 @@
         con.connect()        
         _connections[connection.__id__] = con
         version = "Unknown version"
-        result = execute_query(connection, "SHOW VARIABLES LIKE 'version'")
+        result = execute_query(connection, "SHOW GLOBAL VARIABLES LIKE 'version'")
         if result and result.nextRow():
             version = result.stringByIndex(2)
         grt.send_info("Connected to %s, %s" % (host_identifier, version))
@@ -88,7 +88,7 @@
 @ModuleInfo.export(grt.classes.GrtVersion, grt.classes.db_mgmt_Connection)
 def getServerVersion(connection):
     """Returns a GrtVersion instance containing information about the server version."""
-    result = execute_query(connection, "SHOW VARIABLES LIKE 'version'")
+    result = execute_query(connection, "SHOW GLOBAL VARIABLES LIKE 'version'")
     if result and result.nextRow():
         import re
         p = re.match("([0-9]*)\.([0-9]*)\.([0-9]*)", result.stringByIndex(2))
--- wb_admin_connections.py.orig	2015-05-10 13:36:42.440569636 +0200
+++ wb_admin_connections.py	2015-05-10 13:37:03.856469721 +0200
@@ -571,7 +571,7 @@
         else:
             self.lbl_errors.show(False)
         
-        self.lbl_max_connections.set_text(self.ctrl_be.server_variables['max_connections'])
+        self.lbl_max_connections.set_text(self.ctrl_be.server_global_variables['max_connections'])
 
     def menu_will_show(self, item):
         if item is None:
--- wb_admin_control.py.orig	2015-05-10 13:31:21.966410743 +0200
+++ wb_admin_control.py	2015-05-10 13:32:29.989960713 +0200
@@ -612,6 +612,11 @@
         while result and result.nextRow():
             self.server_variables[result.stringByName("Variable_name")] = result.stringByName("Value")
 
+        self.server_global_variables = {}
+        result = self.exec_query("SHOW GLOBAL VARIABLES")
+        while result and result.nextRow():
+            self.server_global_variables[result.stringByName("Variable_name")] = result.stringByName("Value")
+
         self.status_variables_time = time.time()
         self.status_variables = {}
         result = self.exec_query("SHOW GLOBAL STATUS")
@@ -619,8 +624,8 @@
             self.status_variables[result.stringByName("Variable_name")] = result.stringByName("Value")
 
         # check version
-        if self.server_variables:
-            self.raw_version = self.server_variables["version"]
+        if self.server_global_variables:
+            self.raw_version = self.server_global_variables["version"]
             self.target_version = Version.fromstr(self.raw_version)
 
             if self.server_profile.server_version != self.raw_version: # Update profile version with live data from server
--- wb_admin_logs.py.orig	2015-05-10 14:03:17.795856370 +0200
+++ wb_admin_logs.py	2015-05-10 14:07:53.258597289 +0200
@@ -473,7 +473,7 @@
         if self.ctrl_be.is_sql_connected():  # If server is up, query the destination from there
             if not self.ctrl_be.target_version.is_supported_mysql_version_at_least(5,1,6):  # Logging to TABLE was introduced in v5.1.6
                 try:
-                    result = self.ctrl_be.exec_query("SHOW VARIABLES LIKE 'log'")
+                    result = self.ctrl_be.exec_query("SHOW GLOBAL VARIABLES LIKE 'log'")
                     if not result.nextRow():
                         return dest
                 except:
@@ -482,7 +482,7 @@
                 log_debug('%s: log_output = %s\n' % (self.__class__.__name__, self.server_profile.log_output) )
             else:
                 try:
-                    result = self.ctrl_be.exec_query("SHOW VARIABLES LIKE 'log_output'")
+                    result = self.ctrl_be.exec_query("SHOW GLOBAL VARIABLES LIKE 'log_output'")
                     if not result.nextRow():
                         return dest
                 except:
--- wb_admin_perfschema_instrumentation_be.py.orig	2015-05-10 14:18:34.867749642 +0200
+++ wb_admin_perfschema_instrumentation_be.py	2015-05-10 14:18:55.011668296 +0200
@@ -392,7 +392,7 @@
 
     def load(self):
         try:
-            result = self.ctrl_be.exec_query('SHOW variables LIKE "performance_schema%"')
+            result = self.ctrl_be.exec_query('SHOW GLOBAL VARIABLES LIKE "performance_schema%"')
 
             if result is not None:
                 while result.nextRow():
--- wb_admin_server_status.py.orig	2015-05-10 13:45:57.830685812 +0200
+++ wb_admin_server_status.py	2015-05-10 13:48:10.702411216 +0200
@@ -286,10 +286,7 @@
         repl_error = None
         res = None
         try:
-            if self.ctrl_be.target_version and self.ctrl_be.target_version.is_supported_mysql_version_at_least(5, 7, 0):
-                res = self.ctrl_be.exec_query("SHOW SLAVE STATUS NONBLOCKING")
-            else:
-                res = self.ctrl_be.exec_query("SHOW SLAVE STATUS")
+            res = self.ctrl_be.exec_query("SHOW SLAVE STATUS")
         except QueryError, e:
             if e.error == 1227:
                 repl_error = "Insufficient privileges to view slave status"