Merge branch 'QA_3_3'

2010-04-01 21:07:09 +02:00
parent 7a23444873 366d50a79b
commit 20a402ba29
2 changed files with 5 additions and 0 deletions
--- a/1
+++ b/1
@@ -75,6 +75,7 @@ $Id$
 - patch #2979234 [import] Create tables with current charset and collation.
 - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS.
 - bug #2973280 [export] Proper handling of temporary directory in XLS export.
+- bug #2980582 [interface] Properly format server status parameter.

 3.3.1.0 (2010-03-16)
 - bug #2941037 [core] Database structure not sorted by table correctly 
--- a/server_status.php
+++ b/server_status.php
@@ -143,6 +143,10 @@ if (isset($server_status['Threads_created'])
      * 100;
 }

+// Format Uptime_since_flush_status : show as days, hours, minutes, seconds
+if (isset($server_status['Uptime_since_flush_status'])) {
+    $server_status['Uptime_since_flush_status'] = PMA_timespanFormat($server_status['Uptime_since_flush_status']);
+}

 /**
 * define some alerts