[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4836-g8dfdcca

[Michal Čihař]

The branch, master has been updated
       via  8dfdcca68b69f30efdee5c8d5d8b38bed508e183 (commit)
       via  1e2731dc960c526d978321202094cf66ce229ad4 (commit)
      from  f01d8e099c57d47e51447dcc6167bc1c347c25ee (commit)


- Log -----------------------------------------------------------------
commit 8dfdcca68b69f30efdee5c8d5d8b38bed508e183
Merge: f01d8e099c57d47e51447dcc6167bc1c347c25ee 1e2731dc960c526d978321202094cf66ce229ad4
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Jun 11 12:41:33 2010 +0200

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

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 2a60fbe..9d5723f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,7 @@ $Id$
 - 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 e3dd183..d71d5a0 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