From 0fd933e4936b9954db3779f9c15a7cae2a609172 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Fri, 2 Sep 2005 13:44:55 +0200
Subject: Commit the last part of the manual merge

sql/sql_acl.cc:
  Update after merge
---
 sql/sql_acl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 16a7780d827..c2413545b3a 100644
--- 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
-- 
cgit v1.2.1