patch #2358861 [navi] Row count tooltip wrong for information_schema
This commit is contained in:
@@ -25,6 +25,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
|||||||
+ [lang] Polish update, thanks to Fixer - fixeron
|
+ [lang] Polish update, thanks to Fixer - fixeron
|
||||||
- bug #2568722 [designer] Compound key not shown
|
- bug #2568722 [designer] Compound key not shown
|
||||||
- patch #2550323 [XHTML] in server_databases.php, thanks to Virsacer - virsacer
|
- patch #2550323 [XHTML] in server_databases.php, thanks to Virsacer - virsacer
|
||||||
|
- patch #2358861 [navi] Row count tooltip wrong for information_schema,
|
||||||
|
thanks to Herman van Rink - helmo
|
||||||
|
|
||||||
3.1.2.0 (2009-01-19)
|
3.1.2.0 (2009-01-19)
|
||||||
- bug #1253252 [display] Can't NULL a column with relation defined
|
- bug #1253252 [display] Can't NULL a column with relation defined
|
||||||
|
@@ -225,6 +225,11 @@ foreach ($tables as $keyname => $each_table) {
|
|||||||
case 'ISAM' :
|
case 'ISAM' :
|
||||||
case 'HEAP' :
|
case 'HEAP' :
|
||||||
case 'MEMORY' :
|
case 'MEMORY' :
|
||||||
|
if ($db_is_information_schema) {
|
||||||
|
$each_table['Rows'] = PMA_Table::countRecords($db,
|
||||||
|
$each_table['Name'], $return = true);
|
||||||
|
}
|
||||||
|
|
||||||
if ($is_show_stats) {
|
if ($is_show_stats) {
|
||||||
$tblsize = doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']);
|
$tblsize = doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']);
|
||||||
$sum_size += $tblsize;
|
$sum_size += $tblsize;
|
||||||
|
@@ -784,14 +784,15 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
|
|||||||
// Do not check exact row count here,
|
// Do not check exact row count here,
|
||||||
// if row count is invalid possibly the table is defect
|
// if row count is invalid possibly the table is defect
|
||||||
// and this would break left frame;
|
// and this would break left frame;
|
||||||
// but we can check row count if this is a view,
|
// but we can check row count if this is a view or the
|
||||||
|
// information_schema database
|
||||||
// since PMA_Table::countRecords() returns a limited row count
|
// since PMA_Table::countRecords() returns a limited row count
|
||||||
// in this case.
|
// in this case.
|
||||||
|
|
||||||
// set this because PMA_Table::countRecords() can use it
|
// set this because PMA_Table::countRecords() can use it
|
||||||
$tbl_is_view = PMA_Table::isView($db, $table['Name']);
|
$tbl_is_view = PMA_Table::isView($db, $table['Name']);
|
||||||
|
|
||||||
if ($tbl_is_view) {
|
if ($tbl_is_view || 'information_schema' == $db) {
|
||||||
$table['Rows'] = PMA_Table::countRecords($db, $table['Name'],
|
$table['Rows'] = PMA_Table::countRecords($db, $table['Name'],
|
||||||
$return = true);
|
$return = true);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user