Commit the last part of the manual merge

f1f0af38 · msvensson@neptunus.(none) · 64402b81 · f1f0af38
Commit f1f0af38 authored Sep 02, 2005 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

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