diff options
author | Hugues Peccatte <hugues.peccatte@gmail.com> | 2015-09-09 23:05:00 +0300 |
---|---|---|
committer | Hugues Peccatte <hugues.peccatte@gmail.com> | 2015-09-09 23:05:00 +0300 |
commit | 42c0ebac8515bdc601ba661d575d35cd448150f0 (patch) | |
tree | e89e10b78c8f96adf0fcd2c298fa33964f32ce46 /server_status_processes.php | |
parent | 38ec9e71681743237c58a5a4bb440ca395a55862 (diff) | |
parent | 6a163eaa46171ee0ff7ddf9e7037ffb2f5395bbc (diff) |
Merge branch 'master' into useNamespaces_master
Diffstat (limited to 'server_status_processes.php')
-rw-r--r-- | server_status_processes.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/server_status_processes.php b/server_status_processes.php index f3cd226475..e5ffd70f53 100644 --- a/server_status_processes.php +++ b/server_status_processes.php @@ -15,14 +15,8 @@ require_once 'libraries/server_status_processes.lib.php'; /** * Replication library */ -if (PMA_DRIZZLE) { - $GLOBALS['replication_info'] = array(); - $GLOBALS['replication_info']['master']['status'] = false; - $GLOBALS['replication_info']['slave']['status'] = false; -} else { - include_once 'libraries/replication.inc.php'; - include_once 'libraries/replication_gui.lib.php'; -} +require_once 'libraries/replication.inc.php'; +require_once 'libraries/replication_gui.lib.php'; $ServerStatusData = new ServerStatusData(); $response = PMA\libraries\Response::getInstance(); |