Commit d06e5e2f authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/jonas/src/mysql-5.0
parents 3f767840 8d6c0896

client/mysqltest.c

+5 −0
Original line number Diff line number Diff line
@@ -60,7 +60,12 @@ 
#include <sys/stat.h>

#include <violite.h>

#include <regex.h>                        /* Our own version of lib */

#ifdef HAVE_SYS_WAIT_H

#include <sys/wait.h>

#endif

#ifndef WEXITSTATUS

# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)

#endif

#define MAX_QUERY     131072

#define MAX_VAR_NAME	256

#define MAX_COLUMNS	256

extra/yassl/include/yassl_types.hpp

+2 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ const opaque master_label[MASTER_LABEL_SZ + 1] = "master secret"; 
const opaque key_label   [KEY_LABEL_SZ + 1]    = "key expansion";





} // namespace

} // naemspace



#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96

/*
@@ -456,4 +456,5 @@ const opaque key_label [KEY_LABEL_SZ + 1] = "key expansion"; 
using yaSSL::byte;

#endif





#endif // yaSSL_TYPES_HPP

extra/yassl/src/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ 
	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \

	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp

EXTRA_DIST = ../include/*.hpp ../include/openssl/*.h

AM_CXXFLAGS = -DYASSL_PURE_C

extra/yassl/src/buffer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
 */



#include <string.h>             // memcpy

#include "runtime.hpp"

#include "buffer.hpp"

#include "yassl_types.hpp"

extra/yassl/src/cert_wrapper.cpp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 *

 */



#include "runtime.hpp"

#include "cert_wrapper.hpp"

#include "yassl_int.hpp"