From e2617c58688f7c888fd7a9f1001da8aca8dfe706 Mon Sep 17 00:00:00 2001
From: pratiksethia1 <pratiksethia1@gmail.com>
Date: Wed, 1 Apr 2015 01:57:06 +0530
Subject: [PATCH 1/3] bug#4824 innodb status page empty

Signed-off-by: Pratik Sethia <pratiksethia1@gmail.com>
---
 libraries/engines/innodb.lib.php | 4 ++--
 libraries/sqlparser.lib.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
index f05935dca4..12e4f29bb2 100644
--- a/libraries/engines/innodb.lib.php
+++ b/libraries/engines/innodb.lib.php
@@ -316,13 +316,13 @@ class PMA_StorageEngine_Innodb extends PMA_StorageEngine
     /**
      * returns InnoDB status
      *
-     * @return string  result of SHOW INNODB STATUS inside pre tags
+     * @return string  result of SHOW ENGINE INNODB STATUS inside pre tags
      */
     public function getPageStatus()
     {
         return '<pre id="pre_innodb_status">' . "\n"
             . htmlspecialchars(
-                $GLOBALS['dbi']->fetchValue('SHOW INNODB STATUS;', 0, 'Status')
+                $GLOBALS['dbi']->fetchValue('SHOW ENGINE INNODB STATUS;', 0, 'Status')
             ) . "\n"
             . '</pre>' . "\n";
     }
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 21a6498121..d9df780665 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -849,7 +849,7 @@ function PMA_SQP_parse($sql)
                 $t_suffix = '_reservedWord';
             } elseif (isset($PMA_SQPdata_column_attrib[$d_cur_upper])) {
                 $t_suffix = '_columnAttrib';
-                // INNODB is a MySQL table type, but in "SHOW INNODB STATUS",
+                // INNODB is a MySQL table type, but in "SHOW ENGINE INNODB STATUS",
                 // it should be regarded as a reserved word.
                 if ($d_cur_upper == 'INNODB'
                     && $d_prev_upper == 'SHOW'

From 040d3d294d509532ee1726028b3a180023d5ea9a Mon Sep 17 00:00:00 2001
From: pratiksethia1 <pratiksethia1@gmail.com>
Date: Wed, 1 Apr 2015 02:38:44 +0530
Subject: [PATCH 2/3] additional change

Signed-off-by: Pratik Sethia <pratiksethia1@gmail.com>
---
 libraries/dbi/DBIDummy.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
index 008c857bdd..fef75e867c 100644
--- a/libraries/dbi/DBIDummy.class.php
+++ b/libraries/dbi/DBIDummy.class.php
@@ -94,7 +94,7 @@ $GLOBALS['dummy_queries'] = array(
         )
     ),
     array(
-        'query' => 'SHOW INNODB STATUS;',
+        'query' => 'SHOW ENGINE INNODB STATUS;',
         'result' => false,
     ),
     array(

From c6e8a4d35cfbfaf03f8f4a1decbd56686380cdb7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 1 Apr 2015 08:10:10 -0400
Subject: [PATCH 3/3] ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 7d3e049d3e..e7a7290408 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 - bug #4821 Timed-out import fails to restart when file represented
 - bug #4754 pMA DB not detected properly
 - bug #4825 Datepicker missing when changing number of rows on Insert page
+- bug #4824 INNODB STATUS page is empty
 
 4.4.0.0 (not yet released)
 + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time