Merge neptunus.(none):/home/msvensson/mysql/bug19817/my50-bug19817

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

client/Makefile.am

@@ -16,11 +16,6 @@
 
 # This file is public domain and comes with NO WARRANTY of any kind
 
-if HAVE_YASSL
-  yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
-else
-  yassl_dummy_link_fix=
-endif
 #AUTOMAKE_OPTIONS =              nostdinc
 INCLUDES =			-I$(top_builddir)/include \
 				-I$(top_srcdir)/include \
@@ -40,27 +35,28 @@ mysqladmin_SOURCES =		mysqladmin.cc
 mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
 mysqltest_SOURCES=              mysqltest.c \
 				$(top_srcdir)/mysys/my_getsystime.c \
-				$(top_srcdir)/mysys/my_copy.c \
-                                $(yassl_dummy_link_fix)
+				$(top_srcdir)/mysys/my_copy.c
+
 mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)
-mysqlbinlog_SOURCES =   mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c $(top_srcdir)/mysys/my_new.cc
+mysqlbinlog_SOURCES =   	mysqlbinlog.cc \
+				$(top_srcdir)/mysys/mf_tempdir.c \
+				$(top_srcdir)/mysys/my_new.cc
 mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)
-mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c 
-mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)
-mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)
-mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)
+mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c
+mysqltestmanagerc_SOURCES=      mysqlmanagerc.c
+mysqlcheck_SOURCES=             mysqlcheck.c
+mysqlshow_SOURCES=              mysqlshow.c
 mysqldump_SOURCES=              mysqldump.c my_user.c \
-	                        $(top_srcdir)/mysys/mf_getdate.c \
-                                $(yassl_dummy_link_fix)
-mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)
-mysql_upgrade_SOURCES=          mysql_upgrade.c $(yassl_dummy_link_fix)
+	                        $(top_srcdir)/mysys/mf_getdate.c
+mysqlimport_SOURCES=            mysqlimport.c
+mysql_upgrade_SOURCES=          mysql_upgrade.c
 sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
 strings_src=decimal.c
 
 # Fix for mit-threads
 DEFS =			-DUNDEF_THREADS_HACK \
 			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
-			-DDATADIR="\"$(localstatedir)\"" 
+			-DDATADIR="\"$(localstatedir)\""
 
 EXTRA_DIST =		get_password.c CMakeLists.txt
 

tests/Makefile.am

@@ -17,11 +17,6 @@
 
 ## Process this file with automake to create Makefile.in
 
-if HAVE_YASSL
-  yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
-else
-  yassl_dummy_link_fix=
-endif
 EXTRA_DIST =		auto_increment.res auto_increment.tst \
 			function.res function.tst lock_test.pl lock_test.res \
 			export.pl big_record.pl \
@@ -35,9 +30,6 @@ EXTRA_DIST =		auto_increment.res auto_increment.tst \
 bin_PROGRAMS =		mysql_client_test
 noinst_PROGRAMS =	insert_test select_test thread_test
 
-#
-# C Test for 4.1 protocol
-#
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
 			$(openssl_includes)
 LIBS =			@CLIENT_LIBS@
@@ -45,11 +37,11 @@ LDADD =			@CLIENT_EXTRA_LDFLAGS@ \
                         $(top_builddir)/libmysql/libmysqlclient.la
 
 mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)
-mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \
+mysql_client_test_SOURCES= mysql_client_test.c\
 			$(top_srcdir)/mysys/my_memmem.c
 
-insert_test_SOURCES=       insert_test.c $(yassl_dummy_link_fix)
-select_test_SOURCES=       select_test.c $(yassl_dummy_link_fix)
+insert_test_SOURCES=       insert_test.c
+select_test_SOURCES=       select_test.c
 insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 select_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 

tools/Makefile.am

@@ -15,18 +15,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # Process this file with automake to create Makefile.in
 
-if HAVE_YASSL
-  yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
-else
-  yassl_dummy_link_fix=
-endif
 INCLUDES=	-I$(top_builddir)/include -I$(top_srcdir)/include \
 		$(openssl_includes)
+
 LDADD=		@CLIENT_EXTRA_LDFLAGS@ \
 		$(top_builddir)/libmysql_r/libmysqlclient_r.la \
-		@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ 
+		@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
+
 bin_PROGRAMS=		mysqltestmanager
-mysqltestmanager_SOURCES=	mysqlmanager.c $(yassl_dummy_link_fix)
+mysqltestmanager_SOURCES=	mysqlmanager.c
 mysqltestmanager_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 DEF=			-DUNDEF_THREADS_HACK
 

vio/Makefile.am

 # Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-if HAVE_YASSL
-  yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
-else
-  yassl_dummy_link_fix=
-endif
-INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include \
+INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
 			$(openssl_includes)
-LDADD=			@CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) 
-pkglib_LIBRARIES=	libvio.a
-noinst_PROGRAMS	=	test-ssl test-sslserver test-sslclient
-noinst_HEADERS=	vio_priv.h
-test_ssl_SOURCES=	test-ssl.c $(yassl_dummy_link_fix)
-test_ssl_LDADD=   	@CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
-			../mysys/libmysys.a ../strings/libmystrings.a \
-			$(openssl_libs) $(yassl_libs)
-test_sslserver_SOURCES= test-sslserver.c $(yassl_dummy_link_fix)
-test_sslserver_LDADD=   @CLIENT_EXTRA_LDFLAGS@	../dbug/libdbug.a libvio.a \
-			../mysys/libmysys.a ../strings/libmystrings.a \
-			$(openssl_libs) $(yassl_libs)
-test_sslclient_SOURCES= test-sslclient.c $(yassl_dummy_link_fix)
-test_sslclient_LDADD=   @CLIENT_EXTRA_LDFLAGS@	../dbug/libdbug.a libvio.a \
-			../mysys/libmysys.a ../strings/libmystrings.a \
-			$(openssl_libs) $(yassl_libs)
-libvio_a_SOURCES=	vio.c viosocket.c viossl.c viosslfactories.c
+LDADD =			@CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
+pkglib_LIBRARIES =	libvio.a
+
+noinst_HEADERS =	vio_priv.h
+
+libvio_a_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
+
 EXTRA_DIST=	CMakeLists.txt
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%