diff --git a/ChangeLog b/ChangeLog index ca621e9203..6fc0bd7686 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ 3.2.4.0 (not yet released) +- bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status 3.2.3.0 (2009-10-30) - patch #2856664 [export] Date, time, and datetime column types now export correctly to diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index dad5948a98..d8a7143324 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -231,14 +231,19 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine . ' ' . PMA_formatNumber($status['Innodb_buffer_pool_pages_misc'], 0) . "\n" . '' . "\n" - . ' ' . "\n" - . ' ' . "\n" - . ' ' . $GLOBALS['strLatchedPages'] . '' . "\n" + . ' '; + + // not present at least since MySQL 5.1.40 + if (isset($status['Innodb_buffer_pool_pages_latched'])) { + $output .= ' ' + . ' ' . $GLOBALS['strLatchedPages'] . '' . ' ' - . PMA_formatNumber($status['Innodb_buffer_pool_pages_latched'], 0) . "\n" - . '' . "\n" - . ' ' . "\n" - . ' ' . "\n" + . PMA_formatNumber($status['Innodb_buffer_pool_pages_latched'], 0) + . '' + . ' '; + } + + $output .= ' ' . "\n" . '' . "\n\n" . '' . "\n" . '
' . "\n"