Commit c4c26017 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
parents 1c3cd1fd eb88fd55

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1770,3 +1770,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

libmysqld/event_scheduler.cc

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.11-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.12-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

extra/yassl/examples/echoserver/echoserver.cpp

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ THREAD_RETURN YASSL_API echoserver_test(void* args) 
    while (!shutdown) {

        sockaddr_in client;

        socklen_t   client_len = sizeof(client);

        int         clientfd = accept(sockfd, (sockaddr*)&client, &client_len);

        int         clientfd = accept(sockfd, (sockaddr*)&client,

                                      (ACCEPT_THIRD_T)&client_len);

        if (clientfd == -1) err_sys("tcp accept failed");



        SSL* ssl = SSL_new(ctx);

extra/yassl/include/openssl/ssl.h

+2 −1
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ int SSL_pending(SSL*); 




enum { /* ssl Constants */

    SSL_WOULD_BLOCK     = -8,

    SSL_BAD_STAT        = -7,

    SSL_BAD_PATH        = -6,

    SSL_BAD_FILETYPE    = -5,
@@ -494,7 +495,7 @@ ASN1_TIME* X509_get_notAfter(X509* x); 




typedef struct MD4_CTX {

    void* ptr;

    int buffer[32];      /* big enough to hold, check size in Init */

} MD4_CTX;



void MD4_Init(MD4_CTX*);

extra/yassl/include/socket_wrapper.hpp

+4 −2
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ typedef unsigned char byte; 
// Wraps Windows Sockets and BSD Sockets

class Socket {

    socket_t socket_;                    // underlying socket descriptor

    bool     wouldBlock_;                // for non-blocking data

public:

    explicit Socket(socket_t s = INVALID_SOCKET);

    ~Socket();
@@ -75,9 +76,10 @@ public: 
    socket_t get_fd()    const;



    uint send(const byte* buf, unsigned int len, int flags = 0) const;

    uint receive(byte* buf, unsigned int len, int flags = 0)    const;

    uint receive(byte* buf, unsigned int len, int flags = 0);



    bool wait() const;

    bool wait();

    bool WouldBlock() const;



    void closeSocket();

    void shutDown(int how = SD_SEND);