Commit the last part of the manual merge

sql/sql_acl.cc:
  Update after merge

sql/sql_acl.cc

@@ -1406,7 +1406,7 @@ bool change_password(THD *thd, const char *host, const char *user,
     */
     tables.updating= 1;
     /* Thanks to bzero, tables.next==0 */
-    if (!thp->spcont || rpl_filter->tables_ok(thd, &tables)))
+    if (!thd->spcont || rpl_filter->tables_ok(0, &tables))
       DBUG_RETURN(0);
   }
 #endif