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

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Michal Čihař
2010-06-11 12:41:33 +02:00
parent f01d8e099c 1e2731dc96
commit 8dfdcca68b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -99,6 +99,7 @@ $Id$
- bug #3011126 [display] Edit link missing after long query - bug #3011126 [display] Edit link missing after long query
- patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period, - patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period,
thanks to Isaac Bennetch - ibennetch thanks to Isaac Bennetch - ibennetch
- [engines] Fix getting InnoDB status.
3.3.3.0 (2010-05-10) 3.3.3.0 (2010-05-10)
- patch #2982480 [navi] Do not group if there would be one table in group, - patch #2982480 [navi] Do not group if there would be one table in group,

2
libraries/engines/innodb.lib.php
View File

@@ -305,7 +305,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
function getPageStatus() function getPageStatus()
{ {
return '<pre id="pre_innodb_status">' . "\n" return '<pre id="pre_innodb_status">' . "\n"
. htmlspecialchars(PMA_DBI_fetch_value('SHOW INNODB STATUS;')) . "\n" . htmlspecialchars(PMA_DBI_fetch_value('SHOW INNODB STATUS;', 0, 'Status')) . "\n"
. '</pre>' . "\n"; . '</pre>' . "\n";
} }