diff -u mysql-dfsg-4.1-4.1.14/debian/changelog mysql-dfsg-4.1-4.1.14/debian/changelog
--- mysql-dfsg-4.1-4.1.14/debian/changelog
+++ mysql-dfsg-4.1-4.1.14/debian/changelog
@@ -1,3 +1,10 @@
+mysql-dfsg-4.1 (4.1.14-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Symbol versioning support!  wooooohoooooo!
+
+ -- Steve Langasek <vorlon@debian.org>  Sat, 17 Sep 2005 02:01:48 -0700
+
 mysql-dfsg-4.1 (4.1.14-2) unstable; urgency=high
 
   * Changed the conflicts of mysql-server-4.1 with mysql-client to only
only in patch2:
unchanged:
--- mysql-dfsg-4.1-4.1.14.orig/configure.in
+++ mysql-dfsg-4.1-4.1.14/configure.in
@@ -1281,6 +1281,17 @@
     ;;
 esac
 
+# use symbol versioning on Linux, to avoid problems when
+# mixing-and-matching multiple lib versions; may be useful on other
+# platforms that support symbol versioning (BSDs?)
+case $SYSTEM_TYPE in
+  *linux*)
+	LINKER_SCRIPT="-Wl,--version-script=\$(srcdir)/libmysql.ver"
+	;;
+  *) ;;
+esac
+AC_SUBST(LINKER_SCRIPT)
+
 
 #---START: Used in for client configure
 # Check if we threads are in libc or if we should use
only in patch2:
unchanged:
--- mysql-dfsg-4.1-4.1.14.orig/mysys/libmysql.ver
+++ mysql-dfsg-4.1-4.1.14/mysys/libmysql.ver
@@ -0,0 +1,11 @@
+HIDDEN {
+	local:
+		__*;
+		_rest*;
+		_save*;
+};
+
+MYSQL_4.1 {
+	global:
+		*;
+};
only in patch2:
unchanged:
--- mysql-dfsg-4.1-4.1.14.orig/libmysql_r/Makefile.am
+++ mysql-dfsg-4.1-4.1.14/libmysql_r/Makefile.am
@@ -44,3 +44,4 @@
 	  rm -f $(srcdir)/$$f; \
 	  @LN_CP_F@ $(libmysql_dir)/$$f $(srcdir)/$$f; \
 	done
+	@LN_CP_F@ $(srcdir)/../mysys/libmysql.ver $(srcdir)/$$f
only in patch2:
unchanged:
--- mysql-dfsg-4.1-4.1.14.orig/libmysql/Makefile.shared
+++ mysql-dfsg-4.1-4.1.14/libmysql/Makefile.shared
@@ -75,7 +75,7 @@
 mysysobjects =		$(mysysobjects1) $(mysysobjects2)
 target_libadd =		$(mysysobjects) $(mystringsobjects) $(dbugobjects) \
  $(sql_cmn_objects) $(vio_objects) $(sqlobjects)
-target_ldflags = -version-info @SHARED_LIB_VERSION@
+target_ldflags = -version-info @SHARED_LIB_VERSION@ @LINKER_SCRIPT@
 vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
 CLEANFILES =		$(target_libadd) $(SHLIBOBJS) \
 			$(target)
only in patch2:
unchanged:
--- mysql-dfsg-4.1-4.1.14.orig/libmysql/Makefile.am
+++ mysql-dfsg-4.1-4.1.14/libmysql/Makefile.am
@@ -70,6 +70,7 @@
 	  @LN_CP_F@ $(srcdir)/../sql/net_serv.cc $(srcdir)/net.c ; \
 	  rm -f $(srcdir)/password.c; \
 	  @LN_CP_F@ $(srcdir)/../sql/password.c $(srcdir)/password.c
+	  @LN_CP_F@ $(srcdir)/../mysys/libmysql.ver $(srcdir)/$$f
 
 # This part requires GNUmake
 #