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

[Martin Skold]

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

 4283 Martin Skold	2011-04-19
      bug#11938564  NDB DIST PRIV FAILS TO REPLICATE REVOKE UPDATE: Using available database in table list

    modified:
      sql/sql_acl.cc
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2011-04-01 09:01:10 +0000
+++ b/sql/sql_acl.cc	2011-04-19 12:06:58 +0000
@@ -3326,12 +3326,11 @@ int mysql_table_grant(THD *thd, TABLE_LI
 #ifndef MCP_WL5482
   if (!save_result) /* Same condition as 'write_bin_log' */
   {
-    char *lex_db= thd->lex->select_lex.db;
     char * db= table_list->get_db_name();
     ha_binlog_log_query(thd, 0,
                         LOGCOM_GRANT,
                         thd->query(), thd->query_length(),
-                        (lex_db)?lex_db:((db)?db:"mysql"), "");
+                        (db)?db:"mysql", "");
   }
 #endif
 


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