Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -38,6 +38,7 @@ phpMyAdmin - ChangeLog
 - bug #4288 Expand database (+ icon) after timeout doesn't do anything
 - bug #4285 Fixed CSS for setup
 - Fixed altering table to DOUBLE/FLOAT field
+- bug #4292 Success message and failure message being shown together
 
 4.1.7.0 (2014-02-09)
 - bug #4245 initial Browse query does not match sorting order

js/sql.js

@@ -208,6 +208,8 @@ AJAX.registerOnload('sql.js', function () {
      * @memberOf    jQuery
      */
     $("#button_submit_query").live('click', function (event) {
+        $(".success,.error").hide();
+        //hide already existing error or success message
         var $form = $(this).closest("form");
         // the Go button related to query submission was clicked,
         // instead of the one related to Bookmarks, so empty the