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

bug #964011

Browse Source
This commit is contained in:
Alexander M. Turek
2004-06-02 13:31:04 +00:00
parent 2bbeebbb96
commit 7192ed534c
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-06-02 Alexander M. Turek <happybirthdaytome@derrabus.de>
* db_details_db_info.php, tbl_properties_tbl_info.php: Table type is called
"Engine" in MySQL 4.1.2 (bug #964011).
2004-05-31 Marc Delisle <lem9@users.sourceforge.net> 2004-05-31 Marc Delisle <lem9@users.sourceforge.net>
* header.inc.php: bug #963414, when PropertiesIconic was false, * header.inc.php: bug #963414, when PropertiesIconic was false,
the code did not define the icon variables. Also, remove hardcoded the code did not define the icon variables. Also, remove hardcoded
@@ -19,7 +23,7 @@ $Source$
* sql.php: bug #956828, deleting last row gives an error. I could not * sql.php: bug #956828, deleting last row gives an error. I could not
find a case where we need the line I just removed, which was find a case where we need the line I just removed, which was
causing the bug. causing the bug.
* tbl_properties.inc.php: missing statement group {}, was causing * tbl_properties.inc.php: missing statement group {}, was causing
the display of part of the changing amount of columns dialog the display of part of the changing amount of columns dialog
when editing a field structure when editing a field structure

7
db_details_db_info.php
View File

@@ -67,6 +67,10 @@ if ($cfg['SkipLockedTables'] == TRUE) {
$sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';'); $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';');
$sts_tmp = PMA_DBI_fetch_assoc($sts_result); $sts_tmp = PMA_DBI_fetch_assoc($sts_result);
if (!isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
$sts_tmp['Type'] =& $sts_tmp['Engine'];
}
if (!empty($tbl_group) && $cfg['ShowTooltipAliasTB'] && !preg_match('@' . preg_quote($tbl_group, '@') . '@i', $sts_tmp['Comment'])) { if (!empty($tbl_group) && $cfg['ShowTooltipAliasTB'] && !preg_match('@' . preg_quote($tbl_group, '@') . '@i', $sts_tmp['Comment'])) {
continue; continue;
} }
@@ -90,6 +94,9 @@ if (!isset($sot_ready)) {
$db_info_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . $tbl_group_sql . ';', NULL, PMA_DBI_QUERY_STORE); $db_info_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . $tbl_group_sql . ';', NULL, PMA_DBI_QUERY_STORE);
if ($db_info_result != FALSE && PMA_DBI_num_rows($db_info_result) > 0) { if ($db_info_result != FALSE && PMA_DBI_num_rows($db_info_result) > 0) {
while ($sts_tmp = PMA_DBI_fetch_assoc($db_info_result)) { while ($sts_tmp = PMA_DBI_fetch_assoc($db_info_result)) {
if (!isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
$sts_tmp['Type'] =& $sts_tmp['Engine'];
}
if (!empty($tbl_group) && $cfg['ShowTooltipAliasTB'] && !preg_match('@' . preg_quote($tbl_group, '@') . '@i', $sts_tmp['Comment'])) { if (!empty($tbl_group) && $cfg['ShowTooltipAliasTB'] && !preg_match('@' . preg_quote($tbl_group, '@') . '@i', $sts_tmp['Comment'])) {
continue; continue;
} }

3
tbl_properties_table_info.php
View File

@@ -17,6 +17,9 @@ PMA_checkParameters(array('db', 'table'));
// The 'show table' statement works correct since 3.23.03 // The 'show table' statement works correct since 3.23.03
$table_info_result = PMA_DBI_query('SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\';'); $table_info_result = PMA_DBI_query('SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\';');
$showtable = PMA_DBI_fetch_assoc($table_info_result); $showtable = PMA_DBI_fetch_assoc($table_info_result);
if (!isset($showtable['Type']) && isset($showtable['Engine'])) {
$showtable['Type'] =& $showtable['Engine'];
}
$tbl_type = isset($showtable['Type']) ? strtoupper($showtable['Type']) : ''; $tbl_type = isset($showtable['Type']) ? strtoupper($showtable['Type']) : '';
$tbl_collation = empty($showtable['Collation']) ? '' : $showtable['Collation']; $tbl_collation = empty($showtable['Collation']) ? '' : $showtable['Collation'];
$table_info_num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0); $table_info_num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);