Commit 53f8fed4 authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/mysql-5.0 

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents e324da30 f81ed05c

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

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static void usage(int version) 
	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,

         readline, rl_library_version);

#else

  printf("%s  Ver %s Distrib %s, for %s (%s)", my_progname, VER,

  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,

	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);

#endif

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;