summaryrefslogtreecommitdiff
path: root/extra/yassl/testsuite
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-09-27 14:44:06 +0200
committermsvensson@neptunus.(none) <>2006-09-27 14:44:06 +0200
commit312b4de0359542dbd031cb955b4287cf2bf8941c (patch)
treecdbd58096c247ba79b6b9b7a4dc77f3ce3797977 /extra/yassl/testsuite
parent7f209e3152365a496e12e5d172d3f64cb03660f7 (diff)
parente4676ef60a6a8e1d8130d6131a6aad9ce11d6769 (diff)
downloadmariadb-git-312b4de0359542dbd031cb955b4287cf2bf8941c.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'extra/yassl/testsuite')
-rw-r--r--extra/yassl/testsuite/test.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/testsuite/test.hpp b/extra/yassl/testsuite/test.hpp
index 1279bc7f9d4..0266c802657 100644
--- a/extra/yassl/testsuite/test.hpp
+++ b/extra/yassl/testsuite/test.hpp
@@ -312,7 +312,7 @@ inline void tcp_listen(SOCKET_T& sockfd)
}
-inline void tcp_accept(SOCKET_T& sockfd, int& clientfd, func_args& args)
+inline void tcp_accept(SOCKET_T& sockfd, SOCKET_T& clientfd, func_args& args)
{
tcp_listen(sockfd);