bk commit into 5.1 tree (msvensson:1.2360)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-13 18:06:05+01:00, msvensson@neptunus.(none) +1 -0
  Remove "yassl_dummy_link_fix" in 5.1 as well

  client/Makefile.am@stripped, 2006-11-13 18:06:03+01:00, msvensson@neptunus.(none) +6 -14
    Remove "yassl_dummy_link_fix" in 5.1 as well

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.79/client/Makefile.am	2006-11-13 18:06:11 +01:00
+++ 1.80/client/Makefile.am	2006-11-13 18:06:11 +01:00
@@ -16,12 +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
-
 if THREAD_SAFE_CLIENT
 LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql_r/libmysqlclient_r.la
 else
@@ -71,19 +65,18 @@ mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLA
 
 mysqldump_SOURCES=              mysqldump.c \
 				my_user.c \
-	                        $(top_srcdir)/mysys/mf_getdate.c \
-                                $(yassl_dummy_link_fix)
+	                        $(top_srcdir)/mysys/mf_getdate.c
 
-mysqlimport_SOURCES=		mysqlimport.c $(yassl_dummy_link_fix)
+mysqlimport_SOURCES=		mysqlimport.c
 
 mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
 				@CLIENT_EXTRA_LDFLAGS@ \
 				$(LIBMYSQLCLIENT_LA) \
 				$(top_builddir)/mysys/libmysys.a
 
-mysqlshow_SOURCES=		mysqlshow.c $(yassl_dummy_link_fix)
+mysqlshow_SOURCES=		mysqlshow.c
 
-mysqlslap_SOURCES=		mysqlslap.c $(yassl_dummy_link_fix)
+mysqlslap_SOURCES=		mysqlslap.c
 mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
 				@CLIENT_EXTRA_LDFLAGS@ \
 				$(LIBMYSQLCLIENT_LA) \
@@ -91,11 +84,10 @@ mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIEN
 
 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)
 
-mysql_upgrade_SOURCES=          mysql_upgrade.c $(yassl_dummy_link_fix)
+mysql_upgrade_SOURCES=          mysql_upgrade.c
 
 # Fix for mit-threads
 DEFS =			-DUNDEF_THREADS_HACK \