Commit 042b9c30 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files

merge

parents 286d73c3 20b6f563

client/mysqlcheck.c

+7 −2
Original line number Diff line number Diff line
@@ -517,9 +517,14 @@ static int process_all_tables_in_db(char *database) 
  LINT_INIT(res);

  if (use_db(database))

    return 1;

  if (mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") ||

	!((res= mysql_store_result(sock))))

  if ((mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") &&

       mysql_query(sock, "SHOW TABLES")) ||

      !(res= mysql_store_result(sock)))

  {

    my_printf_error(0, "Error: Couldn't get table list for database %s: %s",

		    MYF(0), database, mysql_error(sock));

    return 1;

  }



  num_columns= mysql_num_fields(res);

dbug/dbug.c

+9 −0
Original line number Diff line number Diff line
@@ -2407,4 +2407,13 @@ int i_am_a_dummy_function() { 
       return 0;

}



#ifdef __WIN__

char _db_doprnt_;

char _db_enter_;

char _db_pargs_;

char _db_process_;

char _db_push_;

char _db_return_;

#endif /*__WIN__*/



#endif

extra/yassl/include/cert_wrapper.hpp

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "yassl_types.hpp"  // SignatureAlgorithm

#include "buffer.hpp"       // input_buffer

#include "asn.hpp"          // SignerList

#include "openssl/ssl.h"    // internal and external use

#include STL_LIST_FILE

#include STL_ALGORITHM_FILE
@@ -87,6 +88,7 @@ class CertManager { 
    bool verifyNone_;                   // no error if verify fails

    bool failNoCert_;

    bool sendVerify_;

    VerifyCallback verifyCallback_;     // user verify callback

public:

    CertManager();

    ~CertManager();
@@ -118,6 +120,7 @@ public: 
    void setFailNoCert();

    void setSendVerify();

    void setPeerX509(X509*);

    void setVerifyCallback(VerifyCallback);

private:

    CertManager(const CertManager&);            // hide copy

    CertManager& operator=(const CertManager&); // and assign

extra/yassl/include/openssl/prefix_ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#define SSL_load_error_strings yaSSL_load_error_strings

#define SSL_set_session yaSSL_set_session

#define SSL_get_session yaSSL_get_session

#define SSL_flush_sessions yaSSL_flush_sessions

#define SSL_SESSION_set_timeout yaSSL_SESSION_set_timeout

#define SSL_CTX_set_session_cache_mode yaSSL_CTX_set_session_cache_mode

#define SSL_get_peer_certificate yaSSL_get_peer_certificate

extra/yassl/include/openssl/ssl.h

+6 −3
Original line number Diff line number Diff line
@@ -170,8 +170,9 @@ enum { /* X509 Constants */ 
    X509_V_ERR_CRL_SIGNATURE_FAILURE          = 10,

    X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD = 11,

    X509_V_ERR_CRL_HAS_EXPIRED                = 12,

    X509_V_ERR_CERT_REVOKED                   = 13



    X509_V_ERR_CERT_REVOKED                   = 13,

    X509_V_FLAG_CRL_CHECK                     = 14,

    X509_V_FLAG_CRL_CHECK_ALL                 = 15

};
@@ -202,7 +203,8 @@ SSL_CTX* SSL_CTX_new(SSL_METHOD*); 
SSL* SSL_new(SSL_CTX*);

int  SSL_set_fd (SSL*, YASSL_SOCKET_T);

YASSL_SOCKET_T SSL_get_fd(const SSL*);

int  SSL_connect(SSL*);

int  SSL_connect(SSL*);                    // if you get an error from connect

                                           // see note at top of REAMDE

int  SSL_write(SSL*, const void*, int);

int  SSL_read(SSL*, void*, int);

int  SSL_accept(SSL*);
@@ -227,6 +229,7 @@ void SSL_load_error_strings(void); 


int          SSL_set_session(SSL *ssl, SSL_SESSION *session);

SSL_SESSION* SSL_get_session(SSL* ssl);

void         SSL_flush_sessions(SSL_CTX *ctx, long tm);

long         SSL_SESSION_set_timeout(SSL_SESSION*, long);

long         SSL_CTX_set_session_cache_mode(SSL_CTX* ctx, long mode);

X509*        SSL_get_peer_certificate(SSL*);