gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Drizzle support from functionalities in server level

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-09-04 18:53:22 +10:00
parent 256be5b859
commit d16bc93ff1
13 changed files with 43 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/ServerStatusData.class.php
View File

@ -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;

2
libraries/server_common.inc.php
View File

@ -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']);
}

2
libraries/server_databases.lib.php
View File

@ -405,7 +405,7 @@ function PMA_getHtmlForReplicationType(
}
}
if ($is_superuser && ! PMA_DRIZZLE) {
if ($is_superuser) {
$html .= ' <th>' . ($cfg_iconic ? '' : __('Action')) . "\n"
. ' </th>' . "\n";
}

4
libraries/server_status_monitor.lib.php
View File

@ -29,9 +29,7 @@ function PMA_getHtmlForMonitor($ServerStatusData)
$retval .= PMA_getHtmlForAddChartDialog();
if (! PMA_DRIZZLE) {
$retval .= PMA_getHtmlForAnalyseDialog();
}
$retval .= PMA_getHtmlForAnalyseDialog();
$retval .= '<table class="clearfloat" id="chartGrid"></table>';
$retval .= '<div id="logTable">';

61
libraries/server_status_processes.lib.php
View File

@ -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 .= '</a>';
if (! PMA_DRIZZLE && (0 === --$sortableColCount)) {
if (0 === --$sortableColCount) {
$retval .= '<a href="' . $full_text_link . '">';
if ($show_full_sql) {
$retval .= PMA_Util::getImage(

16
server_binlog.php
View File

@ -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)

7
server_databases.php
View File

@ -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';
/**

10
server_status.php
View File

@ -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

11
server_status_advisor.php
View File

@ -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();

11
server_status_monitor.php
View File

@ -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

10
server_status_processes.php
View File

@ -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();

11
server_status_queries.php
View File

@ -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();

11
server_status_variables.php
View File

@ -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