Commit 2cfd44fd authored by unknown's avatar unknown

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:
  merge 5.0-opt->5.1-opt
parents 6cc49e9e 7ee858eb
...@@ -4015,7 +4015,8 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg, ...@@ -4015,7 +4015,8 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg,
const char* db_name; const char* db_name;
GRANT_INFO *grant; GRANT_INFO *grant;
GRANT_TABLE *grant_table; /* Initialized only to make gcc happy */
GRANT_TABLE *grant_table= NULL;
rw_rdlock(&LOCK_grant); rw_rdlock(&LOCK_grant);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment