Commit 15bd3945 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


tests/mysql_client_test.c:
  Auto merged
parents 5c5e0f5c b0cdb895

extra/yassl/include/openssl/generate_prefix_files.pl

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ sub generate_prefix($$) 
      next;

    }



    if ( /^\s*[a-zA-Z0-9*_ ]+\s+([_a-zA-Z0-9]+)\s*\(/ )

    if ( /^\s*[a-zA-Z0-9*_ ]+\s+\*?([_a-zA-Z0-9]+)\s*\(/ )

    {

      print OUT "#define $1 ya$1\n";

    }

extra/yassl/taocrypt/src/misc.cpp

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "runtime.hpp"

#include "misc.hpp"





#if !defined(YASSL_MYSQL_COMPATIBLE)

extern "C" {



    // for libcurl configure test, these are the signatures they use
@@ -37,6 +37,7 @@ extern "C" { 
    char CRYPTO_lock() { return 0;}

    char CRYPTO_add_lock() { return 0;}

}  // extern "C"

#endif



#ifdef YASSL_PURE_C