nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct behavior for "SHOW INNODB STATUS".

Browse Source
This commit is contained in:
Alexander M. Turek
2003-06-01 23:09:46 +00:00
parent 1d676548dc
commit 30304e2578
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2003-06-02 Alexander M. Turek <rabus@users.sourceforge.net>
* Happy Birthday to me :-)
* libraries/sqlparser.lib.php3: Correct behavior for "SHOW INNODB STATUS".
2003-06-01 Michal Cihar <nijel@users.sourceforge.net>
* config.inc.php3, libraries/config_import.lib.php3: Default iconv
parameters to empty string, as older iconv version don't support it

5
libraries/sqlparser.lib.php3
View File

@@ -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
}