Merge magare.gmz:/home/kgeorge/mysql/autopush/B30468-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B30468-5.1-opt

sql/sql_acl.cc

@@ -4042,7 +4042,8 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg,
           grant->version= grant_version;	/* purecov: inspected */
         }
 
-        DBUG_ASSERT ((grant_table= grant->grant_table) != NULL);
+        grant_table= grant->grant_table;
+        DBUG_ASSERT (grant_table);
       }
     }