Add database collations to statistics.
This commit is contained in:
@@ -175,8 +175,13 @@ if (count($statistics) > 0) {
|
||||
. ($sort_by == 'db_name' ? ' <img src="' . $pmaThemeImage . 's_' . $sort_order . '.png" border="0" width="11" height="9" alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
|
||||
. ' </a>' . "\n"
|
||||
. ' ' . "\n"
|
||||
. ' </th>' . "\n"
|
||||
. ' <th>' . "\n"
|
||||
. ' </th>' . "\n";
|
||||
if (PMA_MYSQL_INT_VERSION >= 40101) {
|
||||
echo ' <th>' . "\n"
|
||||
. ' ' . $strCollation . ' ' . "\n"
|
||||
. ' </th>' . "\n";
|
||||
}
|
||||
echo ' <th>' . "\n"
|
||||
. ' ' . "\n"
|
||||
. ' <a href="./server_databases.php?' . $url_query . '&dbstats=1&sort_by=tbl_cnt&sort_order=' . (($sort_by == 'tbl_cnt' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
|
||||
. ' ' . $strNumTables . "\n"
|
||||
@@ -244,6 +249,14 @@ if (count($statistics) > 0) {
|
||||
. ' </a>' . "\n"
|
||||
. ' </td>' . "\n";
|
||||
if (!empty($dbstats)) {
|
||||
if (PMA_MYSQL_INT_VERSION >= 40101) {
|
||||
$current_collation = PMA_getDbCollation($current['db_name']);
|
||||
echo ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
|
||||
. ' <dfn title="' . htmlspecialchars(PMA_getCollationDescr($current_collation)) . '">' . "\n"
|
||||
. ' ' . htmlspecialchars($current_collation) . "\n"
|
||||
. ' </dfn>' . "\n"
|
||||
. ' </td>' . "\n";
|
||||
}
|
||||
echo ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '" align="right">' . "\n"
|
||||
. ' ' . $current['tbl_cnt'] . "\n"
|
||||
. ' </td>' . "\n"
|
||||
@@ -288,8 +301,11 @@ if (count($statistics) > 0) {
|
||||
. ' <th> </th>' . "\n"
|
||||
. ' <th>' . "\n"
|
||||
. ' ' . $strTotalUC . ': ' . $total_calc['db_cnt'] . ' ' . "\n"
|
||||
. ' </th>' . "\n"
|
||||
. ' <th align="right">' . "\n"
|
||||
. ' </th>' . "\n";
|
||||
if (PMA_MYSQL_INT_VERSION >= 40101) {
|
||||
echo ' <th> </th>' . "\n";
|
||||
}
|
||||
echo ' <th align="right">' . "\n"
|
||||
. ' ' . $total_calc['tbl_cnt'] . ' ' . "\n"
|
||||
. ' </th>' . "\n"
|
||||
. ' <th align="right">' . "\n"
|
||||
|
Reference in New Issue
Block a user