Commit e2bf3b21 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/mydev/mysql-5.0-bug10932


configure.in:
  Auto merged
sql/mysql_priv.h:
  Auto merged
parents 02f90923 5213f589

BitKeeper/triggers/post-commit

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


#shift

FROM=$USER@mysql.com

INTERNALS=internals@lists.mysql.com

COMMITS=commits@lists.mysql.com

DOCS=docs-commit@mysql.com

LIMIT=10000

VERSION="5.0"
@@ -61,14 +61,14 @@ EOF 
 ) | /usr/sbin/sendmail -t



#++

# internals@ mail

# commits@ mail

#--

 echo "Notifying internals list at $INTERNALS"

 echo "Notifying commits list at $COMMITS"

 (

   cat <<EOF

List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $INTERNALS

To: $COMMITS

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

X-CSetKey: <$CSETKEY>

$BH

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.17)

AM_INIT_AUTOMAKE(mysql, 5.0.18)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

extra/yassl/include/openssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ long SSL_CTX_sess_set_cache_size(SSL_CTX*, long); 
long SSL_CTX_set_tmp_dh(SSL_CTX*, DH*);



void OpenSSL_add_all_algorithms(void);

void SSL_library_init();

void SSLeay_add_ssl_algorithms(void);

extra/yassl/src/ssl.cpp

+4 −0
Original line number Diff line number Diff line
@@ -648,6 +648,10 @@ void OpenSSL_add_all_algorithms() // compatibility only 
{}





void SSL_library_init()  // compatibility only

{}





DH* DH_new(void)

{

    DH* dh = new (ys) DH;

include/mysql.h

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ typedef unsigned long long my_ulonglong; 


#define MYSQL_COUNT_ERROR (~(my_ulonglong) 0)



/* backward compatibility define - to be removed eventually */

#define ER_WARN_DATA_TRUNCATED WARN_DATA_TRUNCATED



typedef struct st_mysql_rows {

  struct st_mysql_rows *next;		/* list of rows */

  MYSQL_ROW data;