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 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( 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 '
' . "\n"
             . htmlspecialchars(
-                $GLOBALS['dbi']->fetchValue('SHOW INNODB STATUS;', 0, 'Status')
+                $GLOBALS['dbi']->fetchValue('SHOW ENGINE INNODB STATUS;', 0, 'Status')
             ) . "\n"
             . '
' . "\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'