bzr commit into mysql-5.1-telco-7.0 branch (Martin.Skold:4282) Bug#11938564

[Martin Skold]

#At file:///home/marty/MySQL/mysql-5.1-telco-7.0_dist_priv2/ based on revid:martin.skold@stripped

 4282 Martin Skold	2011-04-01
      bug#11938564  NDB DIST PRIV FAILS TO REPLICATE REVOKE UPDATE: Fixed use of possible uninitialized variable

    modified:
      sql/sql_acl.cc
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2011-04-01 07:47:43 +0000
+++ b/sql/sql_acl.cc	2011-04-01 09:01:10 +0000
@@ -6092,6 +6092,7 @@ bool mysql_revoke_all(THD *thd,  List <L
   uint counter, revoked, is_proc;
   int result;
   ACL_DB *acl_db;
+  char* db= NULL;
   TABLE_LIST tables[GRANT_TABLES];
   bool save_binlog_row_based;
   DBUG_ENTER("mysql_revoke_all");
@@ -6149,6 +6150,7 @@ bool mysql_revoke_all(THD *thd,  List <L
 	const char *user,*host;
 
 	acl_db=dynamic_element(&acl_dbs,counter,ACL_DB*);
+        db= acl_db->db;
 	if (!(user=acl_db->user))
 	  user= "";
 	if (!(host=acl_db->host.hostname))
@@ -6265,7 +6267,6 @@ bool mysql_revoke_all(THD *thd,  List <L
 #ifndef MCP_WL5482
   {
     char *lex_db= thd->lex->select_lex.db;
-    char *db= acl_db->db;
     ha_binlog_log_query(thd, 0, LOGCOM_REVOKE,
                         thd->query(), thd->query_length(),
                         (lex_db)?lex_db:((db)?db:"mysql"), "");


Attachment: [text/bzr-bundle] bzr/[e-mail]