Manual merge 5.0->5.1

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/include/lock0lock.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/slave.cc:
  Due to refactoring, this needs to be checked before the call.
sql/sql_acl.cc:
  Resolving conflicts due to bug fix and filter refactoring

sql/sql_acl.cc

@@ -2692,6 +2692,7 @@ 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