Commit 3e2417ed authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build 

into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp


VC++Files/mysys/mysys.dsp:
  Auto merged
include/my_global.h:
  Auto merged
myisam/rt_split.c:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
parents 7ff2a5a5 d35e537a

VC++Files/libmysql/libmysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -219,6 +219,10 @@ SOURCE=..\mysys\default.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\default_modify.c

# End Source File

# Begin Source File



SOURCE=.\dll.c

# End Source File

# Begin Source File

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -180,6 +180,10 @@ SOURCE=..\mysys\default.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\default_modify.c

# End Source File

# Begin Source File



SOURCE=..\sql\derror.cpp

# End Source File

# Begin Source File

VC++Files/mysys/mysys.dsp

+4 −0
Original line number Diff line number Diff line
@@ -209,6 +209,10 @@ SOURCE=.\default.c 
# End Source File

# Begin Source File



SOURCE=.\default_modify.c

# End Source File

# Begin Source File



SOURCE=.\errors.c

# End Source File

# Begin Source File

extra/yassl/include/openssl/ssl.h

+5 −5
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 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



};
@@ -166,7 +166,7 @@ int ERR_GET_REASON(int); 


enum {  /* ERR Constants */

    ERR_TXT_STRING = 1,

    EVP_R_BAD_DECRYPT = 2,

    EVP_R_BAD_DECRYPT = 2

};
@@ -263,8 +263,8 @@ enum { /* ssl Constants */ 
    SSL_UNKNOWN         = -2,

    SSL_FATAL_ERROR     = -1,

    SSL_NORMAL_SHUTDOWN =  0,

    SSL_ERROR_NONE      =  0,   // for most functions

    SSL_FAILURE         =  0,   // for some functions

    SSL_ERROR_NONE      =  0,   /* for most functions */

    SSL_FAILURE         =  0,   /* for some functions */

    SSL_SUCCESS	        =  1,



    SSL_FILETYPE_ASN1    = 10,
@@ -320,7 +320,7 @@ enum { /* ssl Constants */ 
    SSL_ST_ACCEPT         = 94,

    SSL_CB_ALERT          = 95,

    SSL_CB_READ           = 96,

    SSL_CB_HANDSHAKE_DONE = 97,

    SSL_CB_HANDSHAKE_DONE = 97



};

extra/yassl/include/yassl_error.hpp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ enum YasslError { 
    verify_error        = 112,

    send_error          = 113,

    receive_error       = 114,

    certificate_error   = 115,

    certificate_error   = 115



    // 1000+ from TaoCrypt error.hpp