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:
Dieter Adriaenssens
2010-04-01 21:07:09 +02:00
parent 7a23444873 366d50a79b
commit 20a402ba29
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -75,6 +75,7 @@ $Id$
- patch #2979234 [import] Create tables with current charset and collation. - patch #2979234 [import] Create tables with current charset and collation.
- patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS.
- bug #2973280 [export] Proper handling of temporary directory in XLS export. - 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) 3.3.1.0 (2010-03-16)
- bug #2941037 [core] Database structure not sorted by table correctly - bug #2941037 [core] Database structure not sorted by table correctly

4
server_status.php
View File

@@ -143,6 +143,10 @@ if (isset($server_status['Threads_created'])
* 100; * 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 * define some alerts