Commit fb063522 authored by unknown's avatar unknown
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/mysql-5.1-19509


sql/sql_acl.cc:
  Auto merged
parents 4db329fb 6206d1f4

sql/sql_acl.cc

+0 −1
Original line number Diff line number Diff line
@@ -2987,7 +2987,6 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, 
    some kind of updates to the mysql.% tables.

  */

  if (thd->slave_thread && rpl_filter->is_on())

  if (thd->slave_thread && rpl_filter->is_on())

  {

    /*

      The tables must be marked "updating" so that tables_ok() takes them into