diff options
| author | unknown <konstantin@mysql.com> | 2006-01-11 17:49:56 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-01-11 17:49:56 +0300 |
| commit | c6993d67be04f438514ef05823214795d8a59c9a (patch) | |
| tree | d2448a297f3ed21f2430ed18ab84a946003ad947 /include | |
| parent | aa6d8dcc74040b0dec2b923c5b4ccf8d8262d654 (diff) | |
| parent | 31ff9e9a1077d24287a36a3ff1e9e946e11a6a38 (diff) | |
| download | mariadb-git-c6993d67be04f438514ef05823214795d8a59c9a.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
sql/item_strfunc.cc:
Auto merged
sql/password.c:
Manual merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/sha1.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sha1.h b/include/sha1.h index 1c345469d3c..e67acbf96b8 100644 --- a/include/sha1.h +++ b/include/sha1.h @@ -60,8 +60,8 @@ typedef struct SHA1_CONTEXT C_MODE_START -int sha1_reset( SHA1_CONTEXT* ); -int sha1_input( SHA1_CONTEXT*, const uint8 *, unsigned int ); -int sha1_result( SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE] ); +int mysql_sha1_reset(SHA1_CONTEXT*); +int mysql_sha1_input(SHA1_CONTEXT*, const uint8 *, unsigned int); +int mysql_sha1_result(SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE]); C_MODE_END |