diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-28 15:08:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-28 15:08:12 +0100 |
| commit | e79847d16a0f51137ca46f23af7d5276dce7952d (patch) | |
| tree | be71c60badd9dc5a88b07f968688024c1f09a348 /sql/password.c | |
| parent | a293d0788c2425ef702f02b4cce41ed1cf56055f (diff) | |
| download | mariadb-git-e79847d16a0f51137ca46f23af7d5276dce7952d.tar.gz | |
after merge fixes
sql/sql_base.cc:
fix a memory leak
storage/xtradb/handler/ha_innodb.cc:
fix for a visual studio
storage/xtradb/row/row0ins.c:
valgrind complains about uninitialized variable.
incorrect errors in the innodb.test too
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 27fbb07b6e3..64b3d69862d 100644 --- a/sql/password.c +++ b/sql/password.c @@ -196,8 +196,8 @@ check_scramble_323(const unsigned char *scrambled, const char *message, struct my_rnd_struct rand_st; ulong hash_message[2]; /* Big enough for checks. */ - char buff[16], scrambled_buff[SCRAMBLE_LENGTH_323 + 1]; - char *to, extra; + uchar buff[16], scrambled_buff[SCRAMBLE_LENGTH_323 + 1]; + uchar *to, extra; const uchar *pos; /* Ensure that the scrambled message is null-terminated. */ |