[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13189-gec589b6
Michal Čihař
nijel at users.sourceforge.net
Fri Aug 5 13:56:31 CEST 2011
The branch, master has been updated
via ec589b6acd6c96938326dbefcf0bafc80cdd31c0 (commit)
via d9435a050aa3bc95638c332ba3b1dcc41879967d (commit)
via 20298630ed949dba0cab7f6b4bb968c8a5de935f (commit)
from d3cee82ae955ecb75b41ab5ba52769a831ab06bf (commit)
- Log -----------------------------------------------------------------
commit ec589b6acd6c96938326dbefcf0bafc80cdd31c0
Author: Michal Čihař <mcihar at suse.cz>
Date: Fri Aug 5 13:56:18 2011 +0200
Whitespace cleanup
commit d9435a050aa3bc95638c332ba3b1dcc41879967d
Merge: d3cee82ae955ecb75b41ab5ba52769a831ab06bf 20298630ed949dba0cab7f6b4bb968c8a5de935f
Author: Michal Čihař <mcihar at suse.cz>
Date: Fri Aug 5 13:55:53 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
file_echo.php | 2 +-
server_status.php | 60 ++++++++++++++++++++++++++--------------------------
3 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eea949e..265e924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@ phpMyAdmin - ChangeLog
- bug #3313235 [interface] Error div misplaced
- bug #3374802 [interface] Comment on a column breaks inline editing
- bug #3383711 [display] Order by a column in a view doesn't work in some cases
+- bug #3386434 [interface] Add missing space to server status
3.4.4.0 (not yet released)
- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
diff --git a/file_echo.php b/file_echo.php
index 2f65de4..11a4487 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -65,4 +65,4 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
if(!file_exists($_FILES['file']['tmp_name'])) exit();
echo file_get_contents($_FILES['file']['tmp_name']);
}
-?>
\ No newline at end of file
+?>
diff --git a/server_status.php b/server_status.php
index 12f0f25..3e63cf2 100644
--- a/server_status.php
+++ b/server_status.php
@@ -6,7 +6,7 @@
*
* @package phpMyAdmin
*/
-
+
/**
* no need for variables importing
* @ignore
@@ -146,7 +146,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (isset($_REQUEST['log_data'])) {
if(PMA_MYSQL_INT_VERSION < 50106) exit('""');
-
+
$start = intval($_REQUEST['time_start']);
$end = intval($_REQUEST['time_end']);
@@ -155,7 +155,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
'SUM(rows_sent) AS rows_sent, SUM(rows_examined) AS rows_examined, db, sql_text, COUNT(sql_text) AS \'#\' '.
'FROM `mysql`.`slow_log` WHERE start_time > FROM_UNIXTIME('.$start.') '.
'AND start_time < FROM_UNIXTIME('.$end.') GROUP BY sql_text';
-
+
$result = PMA_DBI_try_query($q);
$return = array('rows' => array(), 'sum' => array());
@@ -163,20 +163,20 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
while ($row = PMA_DBI_fetch_assoc($result)) {
$type = strtolower(substr($row['sql_text'],0,strpos($row['sql_text'],' ')));
-
+
switch($type) {
case 'insert':
case 'update':
// Cut off big inserts and updates, but append byte count therefor
if(strlen($row['sql_text']) > 220)
- $row['sql_text'] = substr($row['sql_text'],0,200) . '... [' .
+ $row['sql_text'] = substr($row['sql_text'],0,200) . '... [' .
implode(' ',PMA_formatByteDown(strlen($row['sql_text']), 2, 2)).']';
break;
- default:
+ default:
break;
}
-
+
if(!isset($return['sum'][$type])) $return['sum'][$type] = 0;
$return['sum'][$type] += $row['#'];
$return['rows'][] = $row;
@@ -184,7 +184,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$return['sum']['TOTAL'] = array_sum($return['sum']);
$return['numRows'] = count($return['rows']);
-
+
PMA_DBI_free_result($result);
exit(json_encode($return));
@@ -239,9 +239,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
case 'update':
// Cut off big inserts and updates, but append byte count therefor
if(strlen($row['argument']) > 220)
- $row['argument'] = substr($row['argument'],0,200) . '... [' .
+ $row['argument'] = substr($row['argument'],0,200) . '... [' .
implode(' ',PMA_formatByteDown(strlen($row['argument'])), 2, 2).']';
-
+
break;
default: break;
@@ -276,7 +276,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if(isset($_REQUEST['query_analyzer'])) {
$return = array();
-
+
if(strlen($_REQUEST['database']))
PMA_DBI_select_db($_REQUEST['database']);
@@ -285,20 +285,20 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
// Do not cache query
$query = preg_replace('/^(\s*SELECT)/i','\\1 SQL_NO_CACHE',$_REQUEST['query']);
-
+
$result = PMA_DBI_try_query($query);
$return['affectedRows'] = $GLOBALS['cached_affected_rows'];
-
+
$result = PMA_DBI_try_query('EXPLAIN ' . $query);
while ($row = PMA_DBI_fetch_assoc($result)) {
$return['explain'][] = $row;
}
-
+
// In case an error happened
$return['error'] = PMA_DBI_getError();
-
+
PMA_DBI_free_result($result);
-
+
if($profiling) {
$return['profiling'] = array();
$result = PMA_DBI_try_query('SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING WHERE QUERY_ID=1 ORDER BY seq');
@@ -310,7 +310,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($return));
}
-
+
if(isset($_REQUEST['advisor'])) {
include('libraries/advisor.lib.php');
$advisor = new Advisor();
@@ -431,7 +431,7 @@ if (isset($server_status['Key_reads'])
if (isset($server_status['Threads_created'])
&& isset($server_status['Connections'])
&& $server_status['Connections'] > 0) {
-
+
$server_status['Threads_cache_hitrate_%'] =
100 - $server_status['Threads_created'] / $server_status['Connections'] * 100;
}
@@ -574,7 +574,7 @@ foreach ($server_status as $name => $value) {
if(PMA_DRIZZLE) {
$used_queries = PMA_DBI_fetch_result('SELECT * FROM data_dictionary.global_statements', 0, 1);
unset($used_queries['admin_commands']);
-} else {
+} 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']);
}
@@ -756,18 +756,18 @@ echo __('Runtime Information');
<div id="statustabs_charting">
<?php printMonitor(); ?>
</div>
-
+
<div id="statustabs_advisor">
<p><a href="#startAnalyzer">Start analyzer</a> | <a href="#openAdvisorInstructions">Instructions</a></p>
<div class="tabInnerContent">
</div>
<div id="advisorInstructionsDialog" style="display:none;">
- <?php echo __('The Advisor system can provide recommendations on server variables by analyzing the server status variables.
- Do note however that this system provides recommendations based on fairly simple calculations and by rule of thumb and
+ <?php echo __('The Advisor system can provide recommendations on server variables by analyzing the server status variables.
+ Do note however that this system provides recommendations based on fairly simple calculations and by rule of thumb and
may not necessarily work for your system.
Prior to changing any of the configuration, be sure to know what you are changing and how to undo the change. Wrong tuning
can have a very negative effect on performance.
- The best way to tune the system would be to change only one setting at a time, observe or benchmark your database, and
+ The best way to tune the system would be to change only one setting at a time, observe or benchmark your database, and
undo the change if there was no clearly measurable improvement.'); ?>
</div>
</div>
@@ -1405,7 +1405,7 @@ function printMonitor() {
<a href="#addNewChart">
<img src="themes/dot.gif" class="icon ic_b_chart" alt="" />
<?php echo __('Add chart'); ?>
- </a>
+ </a>
<a href="#rearrangeCharts"><img class="icon ic_b_tblops" src="themes/dot.gif" width="16" height="16" alt=""> <?php echo __('Rearrange/edit charts'); ?></a>
<div class="clearfloat paddingtop"></div>
<div class="floatleft">
@@ -1426,7 +1426,7 @@ function printMonitor() {
<option>10</option>
</select>
</div>
-
+
<div class="clearfloat paddingtop">
<b><?php echo __('Chart arrangement'); ?></b> <?php echo PMA_showHint(__('The arrangement of the charts is stored to the browsers local storage. You may want to export it if you have a complicated set up.')); ?><br/>
<a href="#importMonitorConfig"><?php echo __('Import'); ?></a> <a href="#exportMonitorConfig"><?php echo __('Export'); ?></a> <a href="#clearMonitorConfig"><?php echo __('Reset to default'); ?></a>
@@ -1438,11 +1438,11 @@ function printMonitor() {
<?php if(PMA_MYSQL_INT_VERSION < 50106) { ?>
<p>
<img class="icon ic_s_attention" src="themes/dot.gif" alt="">
- <?php
- echo __('Unfortunately your Database server does not support logging to table, which is a requirement for analyzing the database logs with phpMyAdmin. Logging to table is supported by MySQL 5.1.6 and onwards. You may still use the server charting features however.');
+ <?php
+ echo __('Unfortunately your Database server does not support logging to table, which is a requirement for analyzing the database logs with phpMyAdmin. Logging to table is supported by MySQL 5.1.6 and onwards. You may still use the server charting features however.');
?>
</p>
- <?php
+ <?php
} else {
?>
<p></p>
@@ -1456,7 +1456,7 @@ function printMonitor() {
<p>
<img class="icon ic_s_attention" src="themes/dot.gif" alt="">
<?php
- echo __('<b>Please note:</b> Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more.');
+ echo __('<b>Please note:</b> Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more.');
?>
</p>
</div>
@@ -1527,7 +1527,7 @@ function printMonitor() {
</div>
</div>
</div>
-
+
<!-- For generic use -->
<div id="emptyDialog" title="Dialog" style="display:none;">
</div>
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list