diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-02 13:44:55 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-02 13:44:55 +0200 |
| commit | 0fd933e4936b9954db3779f9c15a7cae2a609172 (patch) | |
| tree | 1f8da6ea74f5618b1dae651ee34d7947522093d0 /sql/sql_acl.cc | |
| parent | 702b7be305949617fdfb56265d3ca6ff6bf10116 (diff) | |
| download | mariadb-git-0fd933e4936b9954db3779f9c15a7cae2a609172.tar.gz | |
Commit the last part of the manual merge
sql/sql_acl.cc:
Update after merge
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 |