Merge remote branch 'origin/master'

2010-06-15 15:39:51 +05:30
parent d2c6e1c5e3 85c00ea45b
commit a8d6f9ff4c
70 changed files with 1748 additions and 2132 deletions
--- 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";
    }