diff options
| author | unknown <monty@mysql.com> | 2004-06-02 12:14:36 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-02 12:14:36 +0300 |
| commit | 5084d1893c8a70cb3019adaab047bdf2c2670860 (patch) | |
| tree | 65349748708867002e635348589dec3d99234b11 /sql/sql_acl.cc | |
| parent | 1f14cc70df1691b5c5ff657dac72330ba0c32f1a (diff) | |
| parent | 4de5ecdca69d499a3fce67fa6c7c166948979dd7 (diff) | |
| download | mariadb-git-5084d1893c8a70cb3019adaab047bdf2c2670860.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index d5becf81771..9d1eb7bc54d 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -629,10 +629,10 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh, if (passwd_len == acl_user_tmp->salt_len) { if (acl_user_tmp->salt_len == 0 || - acl_user_tmp->salt_len == SCRAMBLE_LENGTH && - check_scramble(passwd, thd->scramble, acl_user_tmp->salt) == 0 || + (acl_user_tmp->salt_len == SCRAMBLE_LENGTH ? + check_scramble(passwd, thd->scramble, acl_user_tmp->salt) : check_scramble_323(passwd, thd->scramble, - (ulong *) acl_user_tmp->salt) == 0) + (ulong *) acl_user_tmp->salt)) == 0) { acl_user= acl_user_tmp; res= 0; |