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

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

Merge magare.gmz:/home/kgeorge/mysql/autopush/B30468-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B30468-5.1-opt
d292bc92 · gkodinov/kgeorge@magare.gmz · 3b1d0fbe · bebbe454 · d292bc92
Commit d292bc92 authored Sep 27, 2007 by gkodinov/kgeorge@magare.gmz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_acl.cc sql/sql_acl.cc +2 -1

No files found.
--- a/sql/sql_acl.cc
+++ b/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);
      }
    }