Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog
 - bug [interface] Fixed missing Codemirror for inline query edit when exporting a result set
 - bug #3514490 [auth] Multiple Navigation panels bug still present
 - bug #3515181 [users] Error in create user + underscore + create database
+- bug #3515666 [display] Profiling chart shows wrong data
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.

sql.php

@@ -938,7 +938,11 @@ $(document).ready(makeProfilingChart);
             echo ' <tr>' .  "\n";
             echo '<td>' . ucwords($one_result['Status']) . '</td>' .  "\n";
             echo '<td class="right">' . (PMA_formatNumber($one_result['Duration'], 3, 1)) . 's</td>' .  "\n";
-            $chart_json[ucwords($one_result['Status'])] = $one_result['Duration'];
+            if (isset($chart_json[ucwords($one_result['Status'])])) {
+                $chart_json[ucwords($one_result['Status'])] += $one_result['Duration'];
+            } else {
+                $chart_json[ucwords($one_result['Status'])] = $one_result['Duration'];
+            }
         }
 
         echo '</table>' . "\n";