diff --git a/Docs/manual.texi b/Docs/manual.texi
index 1220565b1a5..90c697402d4 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -50226,6 +50226,7 @@ each individual 4.0.x release.
 
 @itemize @bullet
 @item
+Fixed security bug in database hash
 Made @code{safe_mysqld} a symlink to @code{mysqld_safe} in binary distribution.
 @item
 Fixed security bug when having an empty databasename in the user.db table.
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index aad37477a70..7626fb85879 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -297,7 +297,8 @@ int acl_init(bool dont_read_acl_tables)
 	  user.access|=REFERENCES_ACL | INDEX_ACL | ALTER_ACL;
       }
       /* Convert old privileges */
-      user.access|= LOCK_TABLES_ACL | CREATE_TMP_ACL | SHOW_DB_ACL;
+      if (user.access)
+	user.access|= LOCK_TABLES_ACL | CREATE_TMP_ACL | SHOW_DB_ACL;
       if (user.access & FILE_ACL)
 	user.access|= REPL_CLIENT_ACL | REPL_SLAVE_ACL;
       if (user.access & PROCESS_ACL)