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
This commit is contained in:
unknown 2006-05-11 12:33:43 +02:00
commit fb063522ee

View File

@ -2987,7 +2987,6 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
some kind of updates to the mysql.% tables. some kind of updates to the mysql.% tables.
*/ */
if (thd->slave_thread && rpl_filter->is_on()) 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 The tables must be marked "updating" so that tables_ok() takes them into