Commit 9859ccb6 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/taocrypt/src/integer.cpp:
  Auto merged
extra/yassl/taocrypt/test/test.cpp:
  Auto merged
extra/yassl/testsuite/testsuite.cpp:
  Auto merged
parents f7190989 3f76fbfa

extra/yassl/src/ssl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ void ERR_print_errors_fp(FILE* /*fp*/) 


char* ERR_error_string(unsigned long errNumber, char* buffer)

{

    static char* msg = "Please supply a buffer for error string";

  static char* msg = (char*)"Please supply a buffer for error string";



    if (buffer) {

        SetErrorString(YasslError(errNumber), buffer);

extra/yassl/taocrypt/src/integer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3390,7 +3390,7 @@ void Integer::DivideByPowerOf2(Integer &r, Integer &q, const Integer &a, 
        CopyWords(r.reg_.get_buffer(), a.reg_.get_buffer(), wordCount);

        SetWords(r.reg_+wordCount, 0, r.reg_.size()-wordCount);

        if (n % WORD_BITS != 0)

            r.reg_[wordCount-1] %= (1 << (n % WORD_BITS));

          r.reg_[wordCount-1] %= (word(1) << (n % WORD_BITS));

    }

    else

    {

extra/yassl/taocrypt/test/test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ struct testVector { 
               output_((byte*)out), inLen_(strlen(in)), outLen_(strlen(out)) {}

};



void file_test(int, char**);

int  sha_test();

int  sha256_test();

#ifdef WORD64_AVAILABLE
@@ -300,7 +299,7 @@ void taocrypt_test(void* args) 
#endif // NO_MAIN_DRIVER





void file_test(char* file, byte* check)

void file_test(const char* file, byte* check)

{

    FILE* f;

    int   i(0);

extra/yassl/testsuite/testsuite.cpp

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
typedef unsigned char byte;



void taocrypt_test(void*);

void file_test(char*, byte*);

void file_test(const char*, byte*);



void client_test(void*);

void echoclient_test(void*);