diff options
| author | monty@mysql.com <> | 2005-11-05 01:32:55 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-11-05 01:32:55 +0200 |
| commit | a6f5375cb0cb40055f52e92d20ca04233ce70386 (patch) | |
| tree | 4a7b533b6da471261f5c13c46e4e9f256ec63a0c /include/mysql_com.h | |
| parent | 3b74bb1b03a32616818f50f59cc44644036ab711 (diff) | |
| parent | 303f6b4a7a44511aeb33ccbd9ff43ea2d454aa4c (diff) | |
| download | mariadb-git-a6f5375cb0cb40055f52e92d20ca04233ce70386.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 251b9e76e91..cef63115ad3 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -411,7 +411,7 @@ my_bool check_scramble(const char *reply, const char *message, const unsigned char *hash_stage2); void get_salt_from_password(unsigned char *res, const char *password); void make_password_from_salt(char *to, const unsigned char *hash_stage2); -void octet2hex(char *to, const unsigned char *str, unsigned int len); +char *octet2hex(char *to, const char *str, unsigned int len); /* end of password.c */ |