[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-36-g1e2731d

The branch, QA_3_3 has been updated via 1e2731dc960c526d978321202094cf66ce229ad4 (commit) from 122d86c1c5ef058f45b993fd55908d165d5decc7 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/engines/innodb.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c020c52..ba6ffe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3011126 [display] Edit link missing after long query - patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period, thanks to Isaac Bennetch - ibennetch +- [engines] Fix getting InnoDB status. 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index 44e53f7..0ebca48 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -305,7 +305,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine function getPageStatus() { return '<pre id="pre_innodb_status">' . "\n" - . htmlspecialchars(PMA_DBI_fetch_value('SHOW INNODB STATUS;')) . "\n" + . htmlspecialchars(PMA_DBI_fetch_value('SHOW INNODB STATUS;', 0, 'Status')) . "\n" . '</pre>' . "\n"; } hooks/post-receive -- phpMyAdmin