Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

phpmyadmin · Mar 27, 2015 · 071e43f · 071e43f
2 parents 424a3c1 + 6431883
commit 071e43f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,9 @@ 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
+- bug       Missing tooltip in monitor
 
 4.4.0.0 (not yet released)
 + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time

diff --git a/js/console.js b/js/console.js
@@ -860,6 +860,7 @@ var PMA_consoleMessages = {
             if(confirm(PMA_messages.strConsoleDeleteBookmarkConfirm + '\n' + $message.find('.bookmark_label').text())) {
                 $.post('import.php',
                     {token: PMA_commonParams.get('token'),
+                    server: PMA_commonParams.get('server'),
                     action_bookmark: 2,
                     ajax_request: true,
                     id_bookmark: $message.attr('bookmarkid')},
@@ -963,8 +964,11 @@ var PMA_consoleBookmarks = {
         }
     },
     refresh: function () {
-        $.get('import.php?console_bookmark_refresh=refresh&token=' + PMA_commonParams.get('token'),
-            {'ajax_request': true},
+        $.get('import.php',
+            {ajax_request: true,
+            token: PMA_commonParams.get('token'),
+            server: PMA_commonParams.get('server'),
+            console_bookmark_refresh: 'refresh'},
             function(data) {
                 if(data.console_message_bookmark) {
                     $('#pma_bookmarks .content.bookmark').html(data.console_message_bookmark);
@@ -1001,6 +1005,7 @@ var PMA_consoleBookmarks = {
                 ajax_request: true,
                 console_bookmark_add: 'true',
                 label: $('#pma_bookmarks .card.add [name=label]').val(),
+                server: PMA_commonParams.get('server'),
                 db: $('#pma_bookmarks .card.add [name=targetdb]').val(),
                 bookmark_query: PMA_consoleInput.getText('bookmark'),
                 shared: $('#pma_bookmarks .card.add [name=shared]').prop('checked')},

diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
@@ -1611,7 +1611,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 }
 
                 if (logData.rows.length !== 0) {
-                    runtime.logDataCols = buildLogTable(logData);
+                    runtime.logDataCols = buildLogTable(logData, removeVariables);
 
                     /* Show some stats in the dialog */
                     $('#emptyDialog').dialog({title: PMA_messages.strLoadingLogs});
@@ -1853,7 +1853,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     }
 
     /* Constructs the log table out of the retrieved server data */
-    function buildLogTable(data) {
+    function buildLogTable(data, groupInserts) {
         var rows = data.rows;
         var cols = [];
         var $table = $('<table class="sortable"></table>');
@@ -1904,8 +1904,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     '</span></th><th class="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
 
         // Append a tooltip to the count column, if there exist one
-        if ($('#logTable th:last').html() == '#') {
-            $('#logTable th:last').append('&nbsp;' + PMA_getImage('b_docs.png', '', {'class': 'qroupedQueryInfoIcon'}));
+        if ($('#logTable tr:first th:last').text().indexOf("#") > -1) {
+            $('#logTable tr:first th:last').append('&nbsp;' + PMA_getImage('b_docs.png', '', {'class': 'qroupedQueryInfoIcon'}));
 
             var tooltipContent = PMA_messages.strCountColumnExplanation;
             if (groupInserts) {

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);