diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 6030cec3349..a4516ec4615 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004 Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004 Benoit Mortier       <benoit.mortier@opensides.be>
@@ -23,9 +23,9 @@
  */
 
 /**
-		\file 		htdocs/admin/system/database.php
-		\brief      Page des infos système de la base de donnée
-		\version    $Revision$
+   \file       htdocs/admin/system/database.php
+   \brief      Page des infos système de la base de donnée
+   \version    $Revision$
 */
 
 require("./pre.inc.php");
@@ -36,56 +36,53 @@ $langs->load("admin");
 if (!$user->admin)
   accessforbidden();
 
-
-
 llxHeader();
 
 print_fiche_titre($langs->trans("DatabaseConfiguration"),'','setup');
 
 $base=0;
+$sqls = array();
 if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 {
-    $sql = "SHOW VARIABLES";
-    $base=1;
+  $sqls[0] = "SHOW VARIABLES";
+  $sqls[1] = "SHOW STATUS";
+  $base=1;
 }
 if ($conf->db->type == 'pgsql')
 {
-    $sql = "select name,setting from pg_settings;";
-    $base=2;
+  $sqls[0] = "select name,setting from pg_settings;";
+  $base=2;
 }
 
 if (! $base)
 {
-	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
+  print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
 }
 else
 {
-	print '<br>';
-	print '<table class="noborder">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Parameter").'</td>';
-	print '<td>'.$langs->trans("Value").'</td>';
-	print "</tr>\n";
-		
-	$result = $db->query($sql);
-	if ($result) 
+  foreach($sqls as $sql)
+    {
+      print '<br>';
+      print '<table class="noborder">';
+      print '<tr class="liste_titre">';
+      print '<td>'.$langs->trans("Parameter").'</td>';
+      print '<td>'.$langs->trans("Value").'</td>';
+      print "</tr>\n";
+      
+      $resql = $db->query($sql);
+      if ($resql) 
 	{
-	  $i=0;
-	  $num = $db->num_rows();
 	  $var=True;
-	  while ($i < $num)
+	  while ($row = $db->fetch_row($resql))
 	    {
-	        $objp = $db->fetch_object($result);
-	        $var=!$var;
-	        print "<tr $bc[$var]>";
-	        if ($base==1) print '<td>'.$objp->Variable_name.'</td><td>'.$objp->Value.'</td>';
-	        if ($base==2) print '<td>'.$objp->name.'</td><td>'.$objp->setting.'</td>';
-	        print '</tr>';
-	        
-	        $i++;
+	      $var=!$var;
+	      print "<tr $bc[$var]>";
+	      print '<td>'.$row[0].'</td><td>'.$row[1]."</td></tr>\n";
 	    }
+	  $db->free($resql);
 	}
-	print '</table>';
+      print "</table>\n";
+    }
 }
 
 llxFooter('$Date$ - $Revision$');