Merge commit 'd666ed6'

2014-05-23 10:23:31 -04:00 · 2014-05-23 10:23:31 -04:00 · 7630006be2
commit 7630006be2
parent 20b2a3a707 d666ed61af
1 changed files with 1 additions and 0 deletions
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@ -258,6 +258,7 @@ function PMA_getCollationDescr($collation)
        break;
    case 'bin':
        $is_bin = true;
+        // no break; statement here, continuing with 'general' section:
    case 'general':
        switch ($parts[0]) {
        // Unicode charsets