diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-10 16:33:27 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-10 16:33:27 +0200 |
| commit | 724af49cf01c29dae55fb0b4b43d1d265cf4f3f1 (patch) | |
| tree | 729e10de198e048a97b7fb3ca2d62a16b98ee613 /extra/yassl/include/socket_wrapper.hpp | |
| parent | a25adb1cc830d7e263daa03560a129ac9cd6828a (diff) | |
| download | mariadb-git-724af49cf01c29dae55fb0b4b43d1d265cf4f3f1.tar.gz | |
Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4
$SUBJ$
1. Took a diff between the previous base version and the
mysql sources.
2. Added the new 2.1.4 base version.
3. Reviewed and re-applied the diff from step #1.
Diffstat (limited to 'extra/yassl/include/socket_wrapper.hpp')
| -rw-r--r-- | extra/yassl/include/socket_wrapper.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/include/socket_wrapper.hpp b/extra/yassl/include/socket_wrapper.hpp index 308704c2af0..2372e64e56c 100644 --- a/extra/yassl/include/socket_wrapper.hpp +++ b/extra/yassl/include/socket_wrapper.hpp @@ -26,7 +26,6 @@ #ifndef yaSSL_SOCKET_WRAPPER_HPP #define yaSSL_SOCKET_WRAPPER_HPP -#include <assert.h> #ifdef _WIN32 #include <winsock2.h> @@ -73,7 +72,8 @@ public: uint get_ready() const; socket_t get_fd() const; - uint send(const byte* buf, unsigned int len, int flags = 0) const; + uint send(const byte* buf, unsigned int len, unsigned int& sent, + int flags = 0); uint receive(byte* buf, unsigned int len, int flags = 0); bool wait(); |