A very small security fix

Docs/manual.texi

@@ -50222,6 +50222,9 @@ each individual 4.0.x release.
 
 @itemize @bullet
 @item
+Fixed small security bug when old user table is used with 4.0.3 or higher
+and user had no global access
+@item
 Fixed security bug in database hash
 @item
 Fixed create table from any ITEM_FUNC and reverted a patch for month()

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)