diff options
| author | serg@serg.mylan <> | 2003-04-29 15:12:25 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2003-04-29 15:12:25 +0200 |
| commit | 4ce8558cfb1f5aa6e198ac0d1ff949096f335c6b (patch) | |
| tree | e4437ff73127fd4b6f0b8a4b928b7780d4fff0d8 | |
| parent | 75c5ebe6591b49f7530d30963ce6198a26bb1c68 (diff) | |
| parent | 2f45dd04a051be2bb58323df15e2881d834b91de (diff) | |
| download | mariadb-git-4ce8558cfb1f5aa6e198ac0d1ff949096f335c6b.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| -rw-r--r-- | libmysqld/lib_sql.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 641fd2bb2c1..4e85c29c2f2 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -225,7 +225,8 @@ static bool check_user(THD *thd,enum_server_command command, const char *user, return 1; } thd->master_access=acl_getroot(thd, thd->host, thd->ip, thd->user, - passwd, thd->scramble, &thd->priv_user, + passwd, thd->scramble, + &thd->priv_user, &thd->priv_host, protocol_version == 9 || !(thd->client_capabilities & CLIENT_LONG_PASSWORD),&ur); |