Merge branch 'QA_4_4'

phpmyadmin · Mar 26, 2015 · a0aaf65 · a0aaf65
2 parents c720215 + 112d4a9
commit a0aaf65
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - bug #4813 MySQL 5.7.6 and the Users menu tab
 - bug #4818 MySQL 5.7.6 and changing the password for another user
 - bug #4819 Request URI too large
+- bug #4814 MySQL 5.7.6 and Databases
 - bug       Use 'server' parameter in console to work in multi server environments
 
 4.4.0.0 (not yet released)

diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php
@@ -958,12 +958,15 @@ public function getDatabasesFull($database = null, $force_stats = false,
                         $stats_join";
                 }
                 $sql .= $sql_where_schema . '
-                    GROUP BY s.SCHEMA_NAME
+                    GROUP BY s.SCHEMA_NAME, s.DEFAULT_COLLATION_NAME
                     ORDER BY ' . PMA_Util::backquote($sort_by) . ' ' . $sort_order
                     . $limit;
             } else {
-                $sql = 'SELECT
-                    s.SCHEMA_NAME,
+                $sql  = 'SELECT *,
+                        CAST(BIN_NAME AS CHAR CHARACTER SET utf8) AS SCHEMA_NAME
+                    FROM (';
+                $sql .= 'SELECT
+                    BINARY s.SCHEMA_NAME AS BIN_NAME,
                     s.DEFAULT_COLLATION_NAME';
                 if ($force_stats) {
                     $sql .= ',
@@ -984,7 +987,7 @@ public function getDatabasesFull($database = null, $force_stats = false,
                             ON BINARY t.TABLE_SCHEMA = BINARY s.SCHEMA_NAME';
                 }
                 $sql .= $sql_where_schema . '
-                        GROUP BY BINARY s.SCHEMA_NAME
+                        GROUP BY BINARY s.SCHEMA_NAME, s.DEFAULT_COLLATION_NAME
                         ORDER BY ';
                 if ($sort_by == 'SCHEMA_NAME'
                     || $sort_by == 'DEFAULT_COLLATION_NAME'
@@ -994,6 +997,7 @@ public function getDatabasesFull($database = null, $force_stats = false,
                 $sql .= PMA_Util::backquote($sort_by)
                     . ' ' . $sort_order
                     . $limit;
+                $sql .= ') a';
             }
 
             $databases = $this->fetchResult($sql, 'SCHEMA_NAME', null, $link);