Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 - 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

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