diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php index 9cf958a08b..f5ef0701fa 100644 --- a/libraries/ServerStatusData.class.php +++ b/libraries/ServerStatusData.class.php @@ -327,14 +327,6 @@ class PMA_ServerStatusData $GLOBALS['dbi']->freeResult($server_status_result); } - if (PMA_DRIZZLE) { - // Drizzle doesn't put query statistics into variables, add it - $sql = "SELECT concat('Com_', variable_name), variable_value " - . "FROM data_dictionary.GLOBAL_STATEMENTS"; - $statements = $GLOBALS['dbi']->fetchResult($sql, 0, 1); - $server_status = array_merge($server_status, $statements); - } - // for some calculations we require also some server settings $server_variables = $GLOBALS['dbi']->fetchResult( 'SHOW GLOBAL VARIABLES', 0, 1 @@ -374,18 +366,9 @@ class PMA_ServerStatusData $used_queries ); - if (PMA_DRIZZLE) { - $used_queries = $GLOBALS['dbi']->fetchResult( - 'SELECT * FROM data_dictionary.global_statements', - 0, - 1 - ); - unset($used_queries['admin_commands']); - } else { - // admin commands are not queries (e.g. they include COM_PING, - // which is excluded from $server_status['Questions']) - unset($used_queries['Com_admin_commands']); - } + // admin commands are not queries (e.g. they include COM_PING, + // which is excluded from $server_status['Questions']) + unset($used_queries['Com_admin_commands']); // Set all class properties $this->db_isLocal = false; diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index b9a772fcb2..c1478f5211 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -37,7 +37,7 @@ $GLOBALS['is_grantuser'] = $GLOBALS['dbi']->isUserType('grant'); $GLOBALS['is_createuser'] = $GLOBALS['dbi']->isUserType('create'); // now, select the mysql db -if ($GLOBALS['is_superuser'] && ! PMA_DRIZZLE) { +if ($GLOBALS['is_superuser']) { $GLOBALS['dbi']->selectDb('mysql', $GLOBALS['userlink']); } diff --git a/libraries/server_databases.lib.php b/libraries/server_databases.lib.php index 7af2e057b2..456fd4b99b 100644 --- a/libraries/server_databases.lib.php +++ b/libraries/server_databases.lib.php @@ -405,7 +405,7 @@ function PMA_getHtmlForReplicationType( } } - if ($is_superuser && ! PMA_DRIZZLE) { + if ($is_superuser) { $html .= ' ' . ($cfg_iconic ? '' : __('Action')) . "\n" . ' ' . "\n"; } diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php index 3cee3a17e4..24681da4b2 100644 --- a/libraries/server_status_monitor.lib.php +++ b/libraries/server_status_monitor.lib.php @@ -29,9 +29,7 @@ function PMA_getHtmlForMonitor($ServerStatusData) $retval .= PMA_getHtmlForAddChartDialog(); - if (! PMA_DRIZZLE) { - $retval .= PMA_getHtmlForAnalyseDialog(); - } + $retval .= PMA_getHtmlForAnalyseDialog(); $retval .= '
'; $retval .= '
'; diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php index a5cdf73e77..69e114d7f9 100644 --- a/libraries/server_status_processes.lib.php +++ b/libraries/server_status_processes.lib.php @@ -103,49 +103,22 @@ function PMA_getHtmlForServerProcesslist() ); $sortableColCount = count($sortable_columns); - if (PMA_DRIZZLE) { - $left_str = 'left(p.info, ' - . (int)$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] . ')'; - $sql_query = "SELECT - p.id AS Id, - p.username AS User, - p.host AS Host, - p.db AS db, - p.command AS Command, - p.time AS Time, - p.state AS State," - . ($show_full_sql ? 's.query' : $left_str ) - . " AS Info FROM data_dictionary.PROCESSLIST p " - . ($show_full_sql - ? 'LEFT JOIN data_dictionary.SESSIONS s ON s.session_id = p.id' - : ''); - if (! empty($_REQUEST['showExecuting'])) { - $sql_query .= ' WHERE p.state = "executing" '; - } - if (! empty($_REQUEST['order_by_field']) - && ! empty($_REQUEST['sort_order']) - ) { - $sql_query .= ' ORDER BY p.' . $_REQUEST['order_by_field'] . ' ' - . $_REQUEST['sort_order']; - } - } else { - $sql_query = $show_full_sql - ? 'SHOW FULL PROCESSLIST' - : 'SHOW PROCESSLIST'; - if ((! empty($_REQUEST['order_by_field']) - && ! empty($_REQUEST['sort_order'])) - || (! empty($_REQUEST['showExecuting'])) - ) { - $sql_query = 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` '; - } - if (! empty($_REQUEST['showExecuting'])) { - $sql_query .= ' WHERE state = "executing" '; - } - if (!empty($_REQUEST['order_by_field']) && !empty($_REQUEST['sort_order'])) { - $sql_query .= ' ORDER BY ' - . PMA_Util::backquote($_REQUEST['order_by_field']) - . ' ' . $_REQUEST['sort_order']; - } + $sql_query = $show_full_sql + ? 'SHOW FULL PROCESSLIST' + : 'SHOW PROCESSLIST'; + if ((! empty($_REQUEST['order_by_field']) + && ! empty($_REQUEST['sort_order'])) + || (! empty($_REQUEST['showExecuting'])) + ) { + $sql_query = 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` '; + } + if (! empty($_REQUEST['showExecuting'])) { + $sql_query .= ' WHERE state = "executing" '; + } + if (!empty($_REQUEST['order_by_field']) && !empty($_REQUEST['sort_order'])) { + $sql_query .= ' ORDER BY ' + . PMA_Util::backquote($_REQUEST['order_by_field']) + . ' ' . $_REQUEST['sort_order']; } $result = $GLOBALS['dbi']->query($sql_query); @@ -194,7 +167,7 @@ function PMA_getHtmlForServerProcesslist() $retval .= ''; - if (! PMA_DRIZZLE && (0 === --$sortableColCount)) { + if (0 === --$sortableColCount) { $retval .= ''; if ($show_full_sql) { $retval .= PMA_Util::getImage( diff --git a/server_binlog.php b/server_binlog.php index 4d07e7ace4..a04802c64d 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -21,15 +21,13 @@ require_once 'libraries/server_bin_log.lib.php'; /** * array binary log files */ -$binary_logs = PMA_DRIZZLE - ? null - : $GLOBALS['dbi']->fetchResult( - 'SHOW MASTER LOGS', - 'Log_name', - null, - null, - PMA_DatabaseInterface::QUERY_STORE - ); +$binary_logs = $GLOBALS['dbi']->fetchResult( + 'SHOW MASTER LOGS', + 'Log_name', + null, + null, + PMA_DatabaseInterface::QUERY_STORE +); if (! isset($_REQUEST['log']) || ! array_key_exists($_REQUEST['log'], $binary_logs) diff --git a/server_databases.php b/server_databases.php index ea83ad3784..52fb264a26 100644 --- a/server_databases.php +++ b/server_databases.php @@ -18,12 +18,7 @@ $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_databases.js'); -if (! PMA_DRIZZLE) { - include_once 'libraries/replication.inc.php'; -} else { - $replication_types = array(); - $GLOBALS['replication_info'] = null; -} +require_once 'libraries/replication.inc.php'; require 'libraries/build_html_for_db.lib.php'; /** diff --git a/server_status.php b/server_status.php index a69b84c84f..a2c3ea55af 100644 --- a/server_status.php +++ b/server_status.php @@ -14,14 +14,8 @@ require_once 'libraries/server_status.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'; /** * start output diff --git a/server_status_advisor.php b/server_status_advisor.php index eb2e57c86b..15e8459ab4 100644 --- a/server_status_advisor.php +++ b/server_status_advisor.php @@ -10,15 +10,8 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/Advisor.class.php'; require_once 'libraries/ServerStatusData.class.php'; require_once 'libraries/server_status_advisor.lib.php'; - -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 PMA_ServerStatusData(); diff --git a/server_status_monitor.php b/server_status_monitor.php index 9af3f71e43..ce015597ef 100644 --- a/server_status_monitor.php +++ b/server_status_monitor.php @@ -10,15 +10,8 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/server_common.inc.php'; require_once 'libraries/ServerStatusData.class.php'; require_once 'libraries/server_status_monitor.lib.php'; - -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'; /** * Ajax request diff --git a/server_status_processes.php b/server_status_processes.php index 015bd00d38..49f56e45d5 100644 --- a/server_status_processes.php +++ b/server_status_processes.php @@ -14,14 +14,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 PMA_ServerStatusData(); $response = PMA_Response::getInstance(); diff --git a/server_status_queries.php b/server_status_queries.php index 99a83b7f05..b5f7cb62ec 100644 --- a/server_status_queries.php +++ b/server_status_queries.php @@ -11,15 +11,8 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/server_common.inc.php'; require_once 'libraries/ServerStatusData.class.php'; require_once 'libraries/server_status_queries.lib.php'; - -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 PMA_ServerStatusData(); diff --git a/server_status_variables.php b/server_status_variables.php index 735cc3aea6..842a58bc25 100644 --- a/server_status_variables.php +++ b/server_status_variables.php @@ -10,15 +10,8 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/server_common.inc.php'; require_once 'libraries/ServerStatusData.class.php'; require_once 'libraries/server_status_variables.lib.php'; - -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'; /** * flush status variables if requested