From e4ae264bf8fe053af83f0237c29a976170ddbfc1 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Fri, 28 Feb 2003 20:27:34 +0000 Subject: [PATCH] patch #683302: InnoDB status monitor --- ChangeLog | 8 ++++-- lang/german-iso-8859-1.inc.php3 | 4 ++- lang/german-utf-8.inc.php3 | 4 ++- server_status.php3 | 51 +++++++++++++++++++++++++++------ 4 files changed, 54 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index b89f0957c..961eeb1c2 100755 --- a/ChangeLog +++ b/ChangeLog @@ -12,15 +12,17 @@ $Source$ 2003-02-28 Alexander M. Turek * Documentation.html: Fixed a typo. * server_privileges.php3: Fixed bug #691910. + * server_status.php3, lang/*.inc.php3: Patch #683302: InnoDB status monitor, + thanks to Jason Carlson (jjcarlson). 2003-02-28 Garvin Hicking * config.inc.php3, header.inc.php3, queryframe.php3, querywindow.php3, tbl_query_box.php3, libraries/common.lib.php3, libraries/config_import.lib.php3, - Documentation.html: - - Finetuneing for query window: Only three tabs, if DefaultTab + Documentation.html: + - Finetuneing for query window: Only three tabs, if DefaultTab is not set to 'full'. - Inserted nobr-Tags to make german translation for 'sql history' fit inside a tab. - - Improved windowsize of the query window (no a *lot* smaller, hope this will suit + - Improved windowsize of the query window (no a *lot* smaller, hope this will suit Rabus ;). - Made the textarea smaller (*1.25 instead of *2) for the window only. - Fixed a bug when you changed from a table to a database on the left frame and the diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index 5dcc52b93..3974cc3da 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -599,10 +599,12 @@ $strMIME_without = 'Kursiv dargestellte MIME-Typen besitzen keine untergliederte $strMIME_description = 'Beschreibung'; $strMIME_nodescription = 'Für diese Umwandlung ist keine Beschreibung verfügar.
Bitte fragen Sie den Authoren der Funktion namens %s.'; $strMIME_file = 'Dateiname'; +$strInnodbStat = 'InnoDB-Status'; + +// To translate $strTransformation_image_jpeg__plain = 'Takes an imagefile and outputs a link for it. First options argument is a possible prepended string like http://...';//to translate $strTransformation_text_plain__formatted = 'Preserves original formatting of the field. No Escaping is done.';//to translate $strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entities. No HTML formatting is shown.';//to translate $strTransformation_image_jpeg__link = 'Displays a link to this image (direct blob download, i.e.).';//to translate $strTransformation_image_jpeg__inline = 'Displays an image directly in the table (uses wrapper, direct blob download, i.e.).';//to translate -$strInnodbStat = 'InnoDB Status'; //to translate ?> diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index 921ec5be6..018c7eac6 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -600,10 +600,12 @@ $strMIME_without = 'Kursiv dargestellte MIME-Typen besitzen keine untergliederte $strMIME_description = 'Beschreibung'; $strMIME_nodescription = 'Für diese Umwandlung ist keine Beschreibung verfügar.
Bitte fragen Sie den Authoren der Funktion namens %s.'; $strMIME_file = 'Dateiname'; +$strInnodbStat = 'InnoDB-Status'; + +// To translate $strTransformation_image_jpeg__plain = 'Takes an imagefile and outputs a link for it. First options argument is a possible prepended string like http://...';//to translate $strTransformation_text_plain__formatted = 'Preserves original formatting of the field. No Escaping is done.';//to translate $strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entities. No HTML formatting is shown.';//to translate $strTransformation_image_jpeg__link = 'Displays a link to this image (direct blob download, i.e.).';//to translate $strTransformation_image_jpeg__inline = 'Displays an image directly in the table (uses wrapper, direct blob download, i.e.).';//to translate -$strInnodbStat = 'InnoDB Status'; //to translate ?> diff --git a/server_status.php3 b/server_status.php3 index f2a1a35ef..d041e2e01 100644 --- a/server_status.php3 +++ b/server_status.php3 @@ -15,6 +15,24 @@ require('./server_common.inc.php3'); require('./server_links.inc.php3'); +/** + * InnoDB status + */ +if (!empty($innodbstatus)) { + echo '

' . "\n" + . ' ' . $strInnodbStat . "\n" + . '

' . "\n"; + $sql_query = 'SHOW INNODB STATUS;'; + $res = PMA_mysql_query($sql_query, $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), $sql_query); + $row = PMA_mysql_fetch_row($res); + echo '
' . "\n"
+       . htmlspecialchars($row[0]) . "\n"
+       . '
' . "\n"; + mysql_free_result($res); + include('./footer.inc.php3'); + exit; +} + /** * Displays the sub-page heading */ @@ -201,18 +219,18 @@ if (!empty($serverStatus)) {          @@ -223,9 +241,9 @@ while (list($name, $value) = each($serverStatus)) {    @@ -234,6 +252,23 @@ unset($useBgcolorOne); +
+
  • + + + + +
    • +