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

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

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/mysql-5.1-19509
e6563dea · tnurnberg@mysql.com · 0499b301 · 1e8e031b · e6563dea
Commit e6563dea authored May 11, 2006 by tnurnberg@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sql/sql_acl.cc sql/sql_acl.cc +0 -1

No files found.
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -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