diff options
| author | sasha@mysql.sashanet.com <> | 2001-01-19 12:13:06 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-01-19 12:13:06 -0700 |
| commit | 45fa68611af37c2c474371645a1d4ccf2f97d1b3 (patch) | |
| tree | 8b7e6ca26dc60143ddbc2148c3d8402c3973973e /sql | |
| parent | f433ec1247c521bd5784a45655e41ddbfa483cce (diff) | |
| parent | 99fa5361c46b5a89280bee7a81e6ebca62d0e6ba (diff) | |
| download | mariadb-git-45fa68611af37c2c474371645a1d4ccf2f97d1b3.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 85d57914c78..2317c896dfd 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -781,8 +781,8 @@ bool change_password(THD *thd, const char *host, const char *user, length=(uint) strlen(new_password); new_password[length & 16]=0; - if (!thd || strcmp(thd->user,user) || - my_strcasecmp(host,thd->host ? thd->host : thd->ip)) + if (!thd || (!thd->slave_thread && ( strcmp(thd->user,user) || + my_strcasecmp(host,thd->host ? thd->host : thd->ip)))) { if (check_access(thd, UPDATE_ACL, "mysql",0,1)) return 1; |