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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-02-01 17:30:55 +01:00
commit 1dc427726f
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/DatabaseInterface.class.php
View File

@ -86,12 +86,12 @@ class PMA_DatabaseInterface
/**
* Caches table data so PMA_Table does not require to issue
* SHOW TABLE STATUS again
* SHOW TABLE STATUS again
*
* @param array $tables information for tables of some databases
* @param string|bool $table table name or false
*
* @return void
* @return void
*/
private function _cacheTableData($tables, $table)
{
@ -325,7 +325,7 @@ class PMA_DatabaseInterface
* @param boolean $tbl_is_group $table is a table group
* @param string $tble_type whether table or view
*
* @return string a segment of the WHERE clause
* @return string a segment of the WHERE clause
*/
private function _getTableCondition($table, $tbl_is_group, $tble_type)
{
@ -364,15 +364,15 @@ class PMA_DatabaseInterface
}
/**
* returns the beginning of the SQL statement to fetch the list of tables
* returns the beginning of the SQL statement to fetch the list of tables
*
* @param string $this_databases databases to list
* @param string $sql_where_table additional condition
* @param string $sql_where_table additional condition
*
* @return string the SQL statement
* @return string the SQL statement
*/
private function _getSqlForTablesFull($this_databases, $sql_where_table)
{
{
if (PMA_DRIZZLE) {
$engine_info = PMA_Util::cacheGet('drizzle_engines', true);
$stats_join = "LEFT JOIN (SELECT 0 NUM_ROWS) AS stat ON false";
@ -1924,9 +1924,9 @@ class PMA_DatabaseInterface
/**
* returns the definition of a specific PROCEDURE, FUNCTION, EVENT or VIEW
*
* @param string $db db name
* @param string $which PROCEDURE | FUNCTION | EVENT | VIEW
* @param string $name the procedure|function|event|view name
* @param string $db db name
* @param string $which PROCEDURE | FUNCTION | EVENT | VIEW
* @param string $name the procedure|function|event|view name
*
* @return string the definition
*/

34
libraries/server_status_monitor.lib.php
View File

@ -491,14 +491,16 @@ function PMA_getJsonForChartingDataSet($ret, $statusVarValues, $serverVarValues)
}
/**
* @param array $ret Real-time charting data
* @param array $statusVarValues Status variable values
* @param array $serverVarValues Server variable values
* @param $sysinfo
* @param $cpuload
* @param $memory
* @return array
* Get called to get JSON for charting data
*
* @param array $ret Real-time charting data
* @param array $serverVars Server variable values
* @param array $statusVars Status variable values
* @param mixed $sysinfo System info
* @param mixed $cpuload CPU load
* @param mixed $memory Memory
*
* @return array
*/
function PMA_getJsonForChartingDataGet(
$ret, $serverVars, $statusVars, $sysinfo, $cpuload, $memory
@ -522,14 +524,16 @@ function PMA_getJsonForChartingDataGet(
}
/**
* @param $type
* @param $pName
* @param array $statusVarValues Status variable values
* @param array $serverVarValues Server variable values
* @param array $ret Real-time charting data
* @param $sysinfo
* @param $cpuload
* @param $memory
* Switch called to get JSON for charting data
*
* @param string $type Type
* @param string $pName Name
* @param array $serverVars Server variable values
* @param array $statusVars Status variable values
* @param array $ret Real-time charting data
* @param mixed $sysinfo System info
* @param mixed $cpuload CPU load
* @param mixed $memory Memory
*
* @return array
*/