diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 20:59:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 20:59:57 +0300 |
| commit | 7396dfcca7a1eb906edabec02fb59d168f09343d (patch) | |
| tree | 5971546f2d27f5a8dc186e0f63ae3d2ac9208a6a /sql/password.c | |
| parent | f79c5a658cc33a10d7744a748a4328254e2cbaf7 (diff) | |
| parent | 7b5543b21d31bd1517b49c2524a05b5b83fd9691 (diff) | |
| download | mariadb-git-7396dfcca7a1eb906edabec02fb59d168f09343d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/password.c')
| -rw-r--r-- | sql/password.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/password.c b/sql/password.c index 5e9684acb25..75ac210acd3 100644 --- a/sql/password.c +++ b/sql/password.c @@ -90,7 +90,7 @@ void hash_password(ulong *result, const char *password, uint password_len) { - register ulong nr=1345345333L, add=7, nr2=0x12345671L; + ulong nr=1345345333L, add=7, nr2=0x12345671L; ulong tmp; const char *password_end= password + password_len; for (; password < password_end; password++) @@ -325,7 +325,7 @@ hex2octet(uint8 *to, const char *str, uint len) const char *str_end= str + len; while (str < str_end) { - register char tmp= char_val(*str++); + char tmp= char_val(*str++); *to++= (tmp << 4) | char_val(*str++); } } |