sql_acl.cc:

  Fix for a bug #2546 in 4.1.2 that prevented table / column privileges from being loaded on startup. 


sql/sql_acl.cc:
  Fix for a bug #2546 in 4.1.2 that prevented table / column privileges from being loaded on startup.

sql/sql_acl.cc

@@ -2543,7 +2543,7 @@ my_bool grant_init(THD *org_thd)
   do
   {
     GRANT_TABLE *mem_check;
-    if (!(mem_check=new GRANT_TABLE(t_table,c_table)) || mem_check->ok())
+    if (!(mem_check=new GRANT_TABLE(t_table,c_table)))
     {
       /* This could only happen if we are out memory */
       grant_option= FALSE;			/* purecov: deadcode */
@@ -2562,7 +2562,7 @@ my_bool grant_init(THD *org_thd)
       }
     }
 
-    if (my_hash_insert(&column_priv_hash,(byte*) mem_check))
+    if (mem_check->ok() && my_hash_insert(&column_priv_hash,(byte*) mem_check))
     {
       grant_option= FALSE;
       goto end_unlock;