diff --git a/ChangeLog b/ChangeLog index c9fe0b093..0342d3fe0 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-06-02 Alexander M. Turek + * Happy Birthday to me :-) + * libraries/sqlparser.lib.php3: Correct behavior for "SHOW INNODB STATUS". + 2003-06-01 Michal Cihar * config.inc.php3, libraries/config_import.lib.php3: Default iconv parameters to empty string, as older iconv version don't support it diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3 index 8c78ec0bd..1d407549e 100644 --- a/libraries/sqlparser.lib.php3 +++ b/libraries/sqlparser.lib.php3 @@ -596,6 +596,11 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { $t_suffix = '_reservedWord'; } else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_attrib, $PMA_SQPdata_column_attrib_cnt)) { $t_suffix = '_columnAttrib'; + // INNODB is a MySQL table type, but in "SHOW INNODB STATUS", + // it should be regarded as a reserved word. + if ($d_cur_upper == 'INNODB' && $d_prev_upper == 'SHOW' && $d_next_upper == 'STATUS') { + $t_suffix = '_reservedWord'; + } } else { // Do nothing }