diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-30 14:27:51 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-30 14:27:51 +0300 |
| commit | 09b8283864d92b46ca9d86b495a6194af447869d (patch) | |
| tree | e74be07d689ca62fafa05c9c826c4d6b58a44b00 /sql/sql_parse.cc | |
| parent | ee9aceeb5c30298c3ed7695f97e910e77c6ec759 (diff) | |
| parent | 679f39b9283b239379589629931c4b7a0483a148 (diff) | |
| download | mariadb-git-09b8283864d92b46ca9d86b495a6194af447869d.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index cff7627460e..60942e47337 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -206,7 +206,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user, } thd->master_access=acl_getroot(thd, thd->host, thd->ip, thd->user, passwd, thd->scramble, - &thd->priv_user, &thd->priv_host, + &thd->priv_user, thd->priv_host, protocol_version == 9 || !(thd->client_capabilities & CLIENT_LONG_PASSWORD),&ur); |