beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Respect default collation (bug #3191489)

Browse source
This commit is contained in:
Jakub Vrana 2011-02-25 10:49:19 +01:00
parent f842e33bee
commit 32f2000034
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adminer/drivers/mysql.inc.php
View file

@ -307,7 +307,7 @@ if (!defined("DRIVER")) {
$return = $match[1]; $return = $match[1];
} elseif (preg_match('~ CHARACTER SET ([^ ]+)~', $create, $match)) { } elseif (preg_match('~ CHARACTER SET ([^ ]+)~', $create, $match)) {
// default collation // default collation
$return = $collations[$match[1]][0]; $return = $collations[$match[1]][-1];
} }
return $return; return $return;
} }
@ -479,11 +479,15 @@ if (!defined("DRIVER")) {
function collations() { function collations() {
$return = array(); $return = array();
foreach (get_rows("SHOW COLLATION") as $row) { foreach (get_rows("SHOW COLLATION") as $row) {
$return[$row["Charset"]][] = $row["Collation"]; if ($row["Default"]) {
$return[$row["Charset"]][-1] = $row["Collation"];
} else {
$return[$row["Charset"]][] = $row["Collation"];
}
} }
ksort($return); ksort($return);
foreach ($return as $key => $val) { foreach ($return as $key => $val) {
sort($return[$key]); asort($return[$key]);
} }
return $return; return $return;
} }