diff --git a/ChangeLog b/ChangeLog
index 0961d7b8d..854522e54 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ $Id$
 $Source$
 
 
+2006-07-26 Marc Delisle  <lem9@users.sourceforge.net>
+    * server_privileges.php: bug #1526557, display error when admin 
+      lacks some privileges and tries to do a privilege change
+
 2006-07-22 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_import.lib.php: the Character set of the file
       could appear twice
diff --git a/server_privileges.php b/server_privileges.php
index aa887c76b..cdc36eb50 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1022,6 +1022,10 @@ if (!empty($update_privs)) {
     }
     $sql_query2 .= ';';
     if (!PMA_DBI_try_query($sql_query0)) { // this query may fail, but this does not matter :o)
+        // a case when it can fail is when the admin does not have all
+        // privileges: he can't do a REVOKE ALL PRIVILEGES !
+        // so at least we display the error
+        echo PMA_DBI_getError();
         unset($sql_query0);
     }
     if (isset($sql_query1) && !PMA_DBI_try_query($sql_query1)) { // this one may fail, too...