diff options
author | unknown <sergefp@mysql.com> | 2004-05-24 21:13:38 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2004-05-24 21:13:38 +0400 |
commit | c54f3ba680f6a1fe74e937dfe7b14da04220cba3 (patch) | |
tree | 5d63ab734c1fdc0e1db222f30ea63c47fae38c8c /mysys | |
parent | fbfdcf22f49eacc4a90fb6169dbbecb36d8e8b68 (diff) | |
parent | 88da3ae5f9e69a3bf6ced379908d01da5b3bfbb0 (diff) | |
download | mariadb-git-c54f3ba680f6a1fe74e937dfe7b14da04220cba3.tar.gz |
Merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_lex.h:
SCCS merged
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/sha1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/sha1.c b/mysys/sha1.c index 5271b369b6c..d93b4571baf 100644 --- a/mysys/sha1.c +++ b/mysys/sha1.c @@ -342,7 +342,7 @@ static void SHA1ProcessMessageBlock(SHA1_CONTEXT *context) */ -void SHA1PadMessage(SHA1_CONTEXT *context) +static void SHA1PadMessage(SHA1_CONTEXT *context) { /* Check to see if the current message block is too small to hold |