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

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2013-01-25 19:46:28 +05:30
commit 525e9d0c04
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/schema/Dia_Relation_Schema.class.php
View File

@ -722,7 +722,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
$alltables = $this->getAllTables($db, $this->pageNumber);
foreach ($alltables as $table) {
if (! isset($this->tables[$table])) {
$this->tables[$table] = new Table_Stats(
$this->_tables[$table] = new Table_Stats(
$table, $this->pageNumber, $this->showKeys
);
}
@ -775,19 +775,19 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
private function _addRelation($masterTable, $masterField, $foreignTable,
$foreignField, $showKeys
) {
if (! isset($this->tables[$masterTable])) {
$this->tables[$masterTable] = new Table_Stats(
if (! isset($this->_tables[$masterTable])) {
$this->_tables[$masterTable] = new Table_Stats(
$masterTable, $this->pageNumber, $showKeys
);
}
if (! isset($this->tables[$foreignTable])) {
$this->tables[$foreignTable] = new Table_Stats(
if (! isset($this->_tables[$foreignTable])) {
$this->_tables[$foreignTable] = new Table_Stats(
$foreignTable, $this->pageNumber, $showKeys
);
}
$this->_relations[] = new Relation_Stats(
$this->tables[$masterTable], $masterField,
$this->tables[$foreignTable], $foreignField
$this->_tables[$masterTable], $masterField,
$this->_tables[$foreignTable], $foreignField
);
}
@ -827,7 +827,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
*/
private function _drawTables($changeColor)
{
foreach ($this->tables as $table) {
foreach ($this->_tables as $table) {
$table->tableDraw($changeColor);
}
}

1
server_status.php
View File

@ -126,7 +126,6 @@ function getServerTrafficHtml($ServerStatusData)
PMA_replication_print_status_table($type);
}
}
unset($types);
}
$retval .= '<table id="serverstatustraffic" class="data noclick">';

1
server_status_queries.php
View File

@ -93,7 +93,6 @@ function getQueryStatisticsHtml($ServerStatusData)
arsort($used_queries);
$odd_row = true;
$count_displayed_rows = 0;
$perc_factor = 100 / $total_queries; //(- $ServerStatusData->status['Connections']);
$retval .= '<table id="serverstatusqueriesdetails" class="data sortable noclick">';

6
sql.php
View File

@ -356,7 +356,7 @@ $displayResultsObject->setConfigParamsForDisplayTable();
* Need to find the real end of rows?
*/
if (isset($find_real_end) && $find_real_end) {
$unlim_num_rows = PMA_Table::countRecords($db, $table, $force_exact = true);
$unlim_num_rows = PMA_Table::countRecords($db, $table, true);
$_SESSION['tmp_user_values']['pos'] = @((ceil(
$unlim_num_rows / $_SESSION['tmp_user_values']['max_rows']
) - 1) * $_SESSION['tmp_user_values']['max_rows']);
@ -1481,9 +1481,7 @@ function getTableHtmlForMultipleQueries(
$analyzed_sql = PMA_SQP_analyze($parsed_sql);
$is_select = isset($analyzed_sql[0]['queryflags']['select_from']);
$unlim_num_rows = PMA_Table::countRecords(
$db, $table, $force_exact = true
);
$unlim_num_rows = PMA_Table::countRecords($db, $table, true);
$showtable = PMA_Table::sGetStatusInfo($db, $table, null, true);
$url_query = PMA_generate_common_url($db, $table);

7
user_password.php
View File

@ -174,10 +174,9 @@ function PMA_ChangePassUrlParamsAndSubmitQuery(
$local_query = 'SET password = ' . (($password == '')
? '\'\''
: $hashing_function . '(\'' . PMA_Util::sqlAddSlashes($password) . '\')');
$result = @PMA_DBI_try_query($local_query)
or PMA_Util::mysqlDie(
PMA_DBI_getError(), $sql_query, false, $err_url
);
if (! @PMA_DBI_try_query($local_query)) {
PMA_Util::mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
}
}
/**