summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-09-19 09:46:25 +0500
committerunknown <bar@mysql.com>2005-09-19 09:46:25 +0500
commitfde3732709fc18152557c731faee56e1044065a6 (patch)
tree0b5dc3a41926eee804b45017b4ce58e865ad9159 /include
parent015d55b754bea452aef446b203939abdcceb7463 (diff)
parent149b3761f26080afa7cfb3d289cc30b47918943e (diff)
downloadmariadb-git-fde3732709fc18152557c731faee56e1044065a6.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.b10504
Diffstat (limited to 'include')
-rw-r--r--include/mysql_com.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 969fba4a433..c4eb33a6c9a 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -409,6 +409,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);
/* end of password.c */