Tweak shared patch for 5.1.69.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

1 files changed, 2298 insertions, 0 deletions

diff --git a/02040_all_embedded-library-shared-5.1.69.patch b/02040_all_embedded-library-shared-5.1.69.patch
new file mode 100644
index 0000000..60ea554
--- /dev/null
+++ b/02040_all_embedded-library-shared-5.1.69.patch
@@ -0,0 +1,2298 @@
+Convert all of the static libraries for the embedded libmysqld to build as
+shared.
+
+This enables amarok's mysql extension to properly build as a shared object,
+without statically including libmysqld or nor forcing libmysqld to be built
+with -fPIC.
+
+Thanks to <pageexec@freemail.hu> for the @plt fixes.
+Thanks to Diego Elio Pettenò <flameeyes@gentoo.org> for all the extensive build
+system help with libtool conversions.
+Thanks to Maciej Mrozowski <reavertm@gentoo.org> for working in the redo of the
+patch for mysql-5.1.
+
+Gentoo-Bug: 238487
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=238487
+MySQL-Bug-URL: http://bugs.mysql.com/bug.php?id=39288
+MySQL-Bug: 39288
+MySQL-Lists-URL: http://lists.mysql.com/internals/35947
+X-Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=188019&action=view
+Signed-off-by: Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
+
+=== modified file 'client/Makefile.am'
+---
+ client/Makefile.am                               |   11 -
+ config/ac-macros/plugins.m4                      |  107 ++++++++-----
+ configure.in                                     |    8 -
+ dbug/Makefile.am                                 |    6 
+ extra/Makefile.am                                |    4 
+ libmysqld/Makefile.am                            |  184 ++++++++---------------
+ libmysqld/examples/Makefile.am                   |   10 -
+ mysys/Makefile.am                                |   42 ++---
+ netware/BUILD/compile-linux-tools                |   16 +-
+ netware/Makefile.am                              |    4 
+ regex/Makefile.am                                |    6 
+ server-tools/instance-manager/Makefile.am        |    8 -
+ sql/Makefile.am                                  |   12 -
+ storage/archive/Makefile.am                      |   23 +-
+ storage/archive/plug.in                          |    2 
+ storage/blackhole/Makefile.am                    |   11 -
+ storage/blackhole/plug.in                        |    2 
+ storage/csv/Makefile.am                          |    9 -
+ storage/csv/plug.in                              |    2 
+ storage/example/Makefile.am                      |   11 -
+ storage/federated/Makefile.am                    |   15 +
+ storage/federated/plug.in                        |    3 
+ storage/heap/Makefile.am                         |   37 +++-
+ storage/heap/plug.in                             |    3 
+ storage/innobase/Makefile.am                     |   40 ++---
+ storage/innobase/plug.in                         |    2 
+ storage/innodb_plugin/Makefile.am                |   13 -
+ storage/myisam/Makefile.am                       |  118 ++++++++------
+ storage/myisam/plug.in                           |    4 
+ storage/myisammrg/Makefile.am                    |   20 ++
+ storage/myisammrg/plug.in                        |    3 
+ storage/ndb/config/type_ndbapitest.mk.am         |   31 ++-
+ storage/ndb/config/type_ndbapitools.mk.am        |   33 ++--
+ storage/ndb/config/win-libraries                 |    2 
+ storage/ndb/src/common/util/Makefile.am          |    6 
+ storage/ndb/src/cw/cpcd/Makefile.am              |    6 
+ storage/ndb/src/kernel/Makefile.am               |    7 
+ storage/ndb/src/kernel/blocks/Makefile.am        |   10 -
+ storage/ndb/src/kernel/blocks/backup/Makefile.am |    6 
+ storage/ndb/src/kernel/blocks/dbdict/Makefile.am |   12 -
+ storage/ndb/src/kernel/blocks/dbdih/Makefile.am  |    6 
+ storage/ndb/src/kernel/blocks/dblqh/Makefile.am  |    6 
+ storage/ndb/src/kernel/blocks/dbtup/Makefile.am  |    6 
+ storage/ndb/src/kernel/vm/Makefile.am            |   82 +++++-----
+ storage/ndb/src/mgmclient/Makefile.am            |   65 ++++----
+ storage/ndb/src/mgmsrv/Makefile.am               |   70 ++++----
+ storage/ndb/src/ndbapi/Makefile.am               |   98 ++++++------
+ storage/ndb/test/run-test/Makefile.am            |    6 
+ strings/Makefile.am                              |   16 +-
+ unittest/mysys/Makefile.am                       |   15 +
+ unittest/strings/Makefile.am                     |    9 -
+ unittest/unit.pl                                 |    2 
+ vio/Makefile.am                                  |    4 
+ 53 files changed, 622 insertions(+), 612 deletions(-)
+
+Index: client/Makefile.am
+===================================================================
+--- client/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ client/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -75,7 +75,8 @@ mysqlimport_CFLAGS=		-DTHREAD -UUNDEF_TH
+ mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
+ 				@CLIENT_EXTRA_LDFLAGS@ \
+ 				$(LIBMYSQLCLIENT_LA) \
+-				$(top_builddir)/mysys/libmysys.a
++				$(top_builddir)/mysys/libmysys.la \
++				$(top_builddir)/strings/libmystrings.la
+ 
+ mysqlshow_SOURCES=		mysqlshow.c
+ 
+@@ -84,15 +85,17 @@ mysqlslap_CFLAGS=		-DTHREAD -UMYSQL_CLIE
+ mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
+ 				@CLIENT_EXTRA_LDFLAGS@ \
+ 				$(LIBMYSQLCLIENT_LA) \
+-				$(top_builddir)/mysys/libmysys.a
++				$(top_builddir)/mysys/libmysys.la \
++				$(top_builddir)/strings/libmystrings.la
+ 
+ mysqltest_SOURCES=		mysqltest.cc
+ mysqltest_CXXFLAGS=		-DTHREAD -UMYSQL_CLIENT_NO_THREADS
+ mysqltest_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
+ 				@CLIENT_EXTRA_LDFLAGS@ \
+ 				$(LIBMYSQLCLIENT_LA) \
+-				$(top_builddir)/mysys/libmysys.a \
+-				$(top_builddir)/regex/libregex.a \
++				$(top_builddir)/mysys/libmysys.la \
++				$(top_builddir)/regex/libregex.la \
++				$(top_builddir)/strings/libmystrings.la \
+ 				$(CLIENT_THREAD_LIBS)
+ 
+ mysql_upgrade_SOURCES=          mysql_upgrade.c \
+Index: config/ac-macros/plugins.m4
+===================================================================
+--- config/ac-macros/plugins.m4.orig	2010-11-27 15:02:45.000000000 +0100
++++ config/ac-macros/plugins.m4	2010-11-27 15:02:49.000000000 +0100
+@@ -115,18 +115,32 @@ dnl ------------------------------------
+ dnl Macro: MYSQL_PLUGIN_STATIC
+ dnl
+ dnl SYNOPSIS
+-dnl   MYSQL_PLUGIN_STATIC([name],[libmyplugin.a])
++dnl   MYSQL_PLUGIN_STATIC([name],[libmyplugin.a],[libmyplugin_embedded.a])
+ dnl
+ dnl DESCRIPTION
+-dnl   Declare the name for the static library 
++dnl   Declare the name for the static library
++dnl
++dnl   Third argument is optional, only needed for special plugins that depend
++dnl   on server internals and have source files that must be compiled specially
++dnl   with -DEMBEDDED_LIBRARY for embedded server. If specified, the third
++dnl   argument is used to link embedded server instead of the second.
+ dnl
+ dnl ---------------------------------------------------------------------------
+ 
+ AC_DEFUN([MYSQL_PLUGIN_STATIC],[
+  MYSQL_REQUIRE_PLUGIN([$1])
+  m4_define([MYSQL_PLUGIN_STATIC_]AS_TR_CPP([$1]), [$2])
++ ifelse($#, 3, [
++   m4_define([MYSQL_PLUGIN_EMBEDDED_]AS_TR_CPP([$1]), [$3])
++ ])
+ ])
+ 
++dnl ---------------------------------------------------------------------------
++dnl Substitution variable to use to compile source files specially for
++dnl embedded server.
++dnl To be used by plugins that have sources that depend on server internals.
++dnl ---------------------------------------------------------------------------
++AC_SUBST([plugin_embedded_defs], ["-DEMBEDDED_LIBRARY -DMYSQL_SERVER"])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl Macro: MYSQL_PLUGIN_DYNAMIC
+@@ -254,29 +268,6 @@ AC_DEFUN([MYSQL_PLUGIN_ACTIONS],[
+ ])
+ 
+ dnl ---------------------------------------------------------------------------
+-dnl Macro: MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS
+-dnl
+-dnl SYNOPSIS
+-dnl   MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS([name],[file name])
+-dnl
+-dnl DESCRIPTION
+-dnl   Some modules in plugins keep dependance on structures
+-dnl   declared in sql/ (THD class usually)
+-dnl   That has to be fixed in the future, but until then
+-dnl   we have to recompile these modules when we want to
+-dnl   to compile server parts with the different #defines
+-dnl   Normally it happens when we compile the embedded server
+-dnl   Thus one should mark such files in his handler using this macro
+-dnl    (currently only one such a file per plugin is supported)
+-dnl
+-dnl ---------------------------------------------------------------------------
+-
+-AC_DEFUN([MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS],[
+- MYSQL_REQUIRE_PLUGIN([$1])
+- m4_define([MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS_]AS_TR_CPP([$1]), [$2])
+-])
+-
+-dnl ---------------------------------------------------------------------------
+ dnl Macro: MYSQL_CONFIGURE_PLUGINS
+ dnl
+ dnl SYNOPSIS
+@@ -336,11 +327,25 @@ AC_DEFUN([_MYSQL_EMIT_CHECK_PLUGIN],[
+   [MYSQL_PLUGIN_DYNAMIC_]AS_TR_CPP([$1]),
+   [MYSQL_PLUGIN_MANDATORY_]AS_TR_CPP([$1]),
+   [MYSQL_PLUGIN_DISABLED_]AS_TR_CPP([$1]),
+-  [MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS_]AS_TR_CPP([$1]),
++  [MYSQL_PLUGIN_EMBEDDED_]AS_TR_CPP([$1]),
+   [MYSQL_PLUGIN_ACTIONS_]AS_TR_CPP([$1])
+  )
+ ])
+ 
++# __MYSQL_EMIT_CHECK_PLUGIN arguments:
++#
++#  1 - plugin identifying name
++#  2 - plugin identifying name, with `-' replaced by `_'
++#  3 - plugin long name
++#  4 - plugin description
++#  5 - mysql_plugin_define (eg. WITH_xxx_STORAGE_ENGINE)
++#  6 - directory
++#  7 - static target (if supports static build)
++#  8 - dynamic target (if supports dynamic build)
++#  9 - mandatory flag
++# 10 - disabled flag
++# 11 - static target for libmysqld (if different from mysqld)
++# 12 - actions
+ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
+  m4_ifdef([$5],[
+   AH_TEMPLATE($5, [Include ]$4[ into mysqld])
+@@ -407,6 +412,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
+        ])
+        AC_SUBST([plugin_]$2[_shared_target], "$8")
+        AC_SUBST([plugin_]$2[_static_target], [""])
++       AC_SUBST([plugin_]$2[_embedded_static_target], [""])
+        [with_plugin_]$2=yes
+        AC_MSG_RESULT([plugin])
+        m4_ifdef([$6],[
+@@ -421,32 +427,47 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
+       ])
+     else
+       m4_ifdef([$7],[
+-       ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [
+-dnl change above "-2" to "0" to enable this section
+-dnl Although this is "pretty", it breaks libmysqld build
+-        m4_ifdef([$6],[
+-         mysql_use_plugin_dir="$6"
+-         mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6"
+-        ])
+-        mysql_plugin_libs="$mysql_plugin_libs dnl
+-[-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])"
+-       ], m4_bregexp($7, [^\\\$]), 0, [
++       ifelse(m4_bregexp($7, [^\\\$]), 0, [
+         m4_ifdef([$6],[
+          mysql_use_plugin_dir="$6"
+         ])
+         mysql_plugin_libs="$mysql_plugin_libs $7"
++        m4_ifdef([$11],[
++          mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs $11"
++        ],[
++          mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs $7"
++        ])
+        ], [
+         m4_ifdef([$6],[
+          mysql_use_plugin_dir="$6"
+          mysql_plugin_libs="$mysql_plugin_libs \$(top_builddir)/$6/$7"
++         m4_ifdef([$11],[
++           mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs \$(top_builddir)/$6/$11"
++         ],[
++           mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs \$(top_builddir)/$6/$7"
++         ])
+         ],[
+          mysql_plugin_libs="$mysql_plugin_libs $7"
++         m4_ifdef([$11],[
++           mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs $11"
++         ],[
++           mysql_embedded_plugin_libs="$mysql_embedded_plugin_libs $7"
++         ])
+         ])
+        ])
+        m4_ifdef([$5],[
+         AC_DEFINE($5)
+        ])
+        AC_SUBST([plugin_]$2[_static_target], "$7")
++       m4_ifdef([$11], [
++         if test "$with_embedded_server" = "yes"; then
++           AC_SUBST([plugin_]$2[_embedded_static_target], "$11")
++         else
++           AC_SUBST([plugin_]$2[_embedded_static_target], [""])
++         fi
++       ], [
++         AC_SUBST([plugin_]$2[_embedded_static_target], [""])
++       ])
+        AC_SUBST([plugin_]$2[_shared_target], [""])
+       ],[
+        m4_ifdef([$6],[
+@@ -463,12 +484,6 @@ dnl Although this is "pretty", it breaks
+       mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]"
+       [with_plugin_]$2=yes
+       AC_MSG_RESULT([yes])
+-      m4_ifdef([$11],[
+-       condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp($11, [[^/]+$], [\&])"
+-       condition_dependent_plugin_objects="$condition_dependent_plugin_objects m4_bregexp($11, [[^/]+\.], [\&o])"
+-       condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11"
+-       condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])"
+-      ])
+     fi
+   fi
+ 
+@@ -516,6 +531,14 @@ dnl
+  ])
+ ])
+ 
++dnl If not building libmysqld embedded server, then there is no need to build
++dnl shared object versions of static plugins.
++if test "$with_embedded_server" = "yes"; then
++  AC_SUBST([plugin_static_if_no_embedded], "")
++else
++  AC_SUBST([plugin_static_if_no_embedded], "-static")
++fi
++
+ AC_DEFUN([_MYSQL_EMIT_PLUGIN_ACTIONS],[
+  ifelse($#, 0, [], $#, 1, [
+   _MYSQL_EMIT_PLUGIN_ACTION([$1])
+Index: configure.in
+===================================================================
+--- configure.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ configure.in	2010-11-27 19:41:49.000000000 +0100
+@@ -2483,8 +2483,6 @@ MYSQL_STORAGE_ENGINE(partition, partitio
+ 
+ dnl -- ndbcluster requires partition to be enabled
+ 
+-MYSQL_CONFIGURE_PLUGINS([none])
+-
+ # Only build client code?
+ AC_ARG_WITH(server,
+     [  --without-server        Only build the client.],
+@@ -2498,6 +2496,8 @@ AC_ARG_WITH(embedded-server,
+     [with_embedded_server=no]
+ )
+ 
++MYSQL_CONFIGURE_PLUGINS([none])
++
+ AC_ARG_WITH(query_cache,
+     [  --without-query-cache   Do not build query cache.],
+     [with_query_cache=$withval],
+@@ -2801,9 +2801,6 @@ if test "$with_server" != "no" -o "$THRE
+ then
+   AC_DEFINE([THREAD], [1],
+             [Define if you want to have threaded code. This may be undef on client code])
+-  # Avoid _PROGRAMS names
+-  THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
+-  AC_SUBST(THREAD_LOBJECTS)
+ fi
+ AM_CONDITIONAL(NEED_THREAD, test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no")
+ 
+@@ -2831,6 +2828,7 @@ AC_SUBST(server_scripts)
+ 
+ AC_SUBST(mysql_plugin_dirs)
+ AC_SUBST(mysql_plugin_libs)
++AC_SUBST(mysql_embedded_plugin_libs)
+ AC_SUBST(mysql_plugin_defs)
+ 
+ 
+Index: dbug/Makefile.am
+===================================================================
+--- dbug/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ dbug/Makefile.am	2010-11-27 19:42:26.000000000 +0100
+@@ -16,10 +16,10 @@
+ # MA 02111-1307, USA
+ 
+ INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include
+-LDADD =                 libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a
+-pkglib_LIBRARIES =      libdbug.a
++LDADD =                 libdbug.la ../mysys/libmysys.la ../strings/libmystrings.la $(ZLIB_LIBS)
++noinst_LTLIBRARIES =	libdbug.la
+ noinst_HEADERS =        dbug_long.h
+-libdbug_a_SOURCES =     dbug.c sanity.c
++libdbug_la_SOURCES =	dbug.c sanity.c
+ EXTRA_DIST =            CMakeLists.txt example1.c example2.c example3.c \
+                         user.r monty.doc dbug_add_tags.pl \
+                         my_main.c main.c factorial.c dbug_analyze.c \
+Index: extra/Makefile.am
+===================================================================
+--- extra/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ extra/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -15,8 +15,8 @@
+ 
+ INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
+ 			-I$(top_srcdir)/sql
+-LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
+-			../dbug/libdbug.a ../strings/libmystrings.a \
++LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \
++			../dbug/libdbug.la ../strings/libmystrings.la \
+ 			$(ZLIB_LIBS)
+ BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
+                         $(top_builddir)/include/sql_state.h \
+Index: libmysqld/Makefile.am
+===================================================================
+--- libmysqld/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ libmysqld/Makefile.am	2010-11-27 20:58:00.000000000 +0100
+@@ -17,95 +17,91 @@
+ #
+ # This file is public domain and comes with NO WARRANTY of any kind
+ 
+-MYSQLDATAdir =		$(localstatedir)
+-MYSQLSHAREdir =		$(pkgdatadir)
+-MYSQLBASEdir=		$(prefix)
+-MYSQLLIBdir=            $(libdir)
+-pkgplugindir =		$(pkglibdir)/plugin
++MYSQLDATAdir =	$(localstatedir)
++MYSQLSHAREdir =	$(pkgdatadir)
++MYSQLBASEdir =	$(prefix)
++MYSQLLIBdir =	$(libdir)
++pkgplugindir =	$(pkglibdir)/plugin
+ 
+-EXTRA_DIST =		libmysqld.def CMakeLists.txt
+-DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
++EXTRA_DIST =	libmysqld.def CMakeLists.txt
++DEFS =		-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
+ 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
+ 			-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
+ 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+ 			-DPLUGINDIR="\"$(pkgplugindir)\""
+-INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include \
++INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \
+ 			-I$(top_builddir)/sql -I$(top_srcdir)/sql \
+ 			-I$(top_srcdir)/sql/examples \
+ 			-I$(top_srcdir)/regex \
+-			$(openssl_includes) @ZLIB_INCLUDES@ \
+-			@condition_dependent_plugin_includes@
++			$(openssl_includes) $(ZLIB_INCLUDES) \
++			@condition_dependent_plugin_includes@ \
++			$(ndbcluster_includes)
+ 
+-noinst_LIBRARIES =	libmysqld_int.a
+-pkglib_LIBRARIES =	libmysqld.a
+-SUBDIRS =		. examples
++pkglib_LTLIBRARIES =	libmysqld.la
++SUBDIRS =	. examples
+ libmysqld_sources=	libmysqld.c lib_sql.cc emb_qcache.cc
+ libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c \
+-                        my_time.c
++			my_time.c
+ 
+ noinst_HEADERS =	embedded_priv.h emb_qcache.h
+ 
+-sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
+-	     ha_ndbcluster.cc ha_ndbcluster_cond.cc \
+-	ha_ndbcluster_binlog.cc ha_partition.cc \
+-	handler.cc sql_handler.cc \
+-	hostname.cc init.cc password.c \
+-	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
+-	item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
+-	item_geofunc.cc item_subselect.cc item_row.cc\
+-	item_xmlfunc.cc \
+-	key.cc lock.cc log.cc sql_state.c \
+-	log_event.cc rpl_record.cc \
+-	log_event_old.cc rpl_record_old.cc \
+-	protocol.cc net_serv.cc opt_range.cc \
+-	opt_sum.cc procedure.cc records.cc sql_acl.cc \
+-	sql_load.cc discover.cc sql_locale.cc \
+-	sql_profile.cc \
+-	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
+-	sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \
+-	sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc \
+-	scheduler.cc sql_connect.cc sql_parse.cc \
+-	sql_prepare.cc sql_derived.cc sql_rename.cc \
+-	sql_select.cc sql_do.cc sql_show.cc set_var.cc \
+-	sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
+-	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
+-	unireg.cc uniques.cc sql_union.cc hash_filo.cc \
+-	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
+-	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
+-	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
+-	rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
+-	debug_sync.cc \
+-	sql_tablespace.cc \
+-	rpl_injector.cc my_user.c partition_info.cc \
+-	sql_servers.cc event_parse_data.cc
+-
+-libmysqld_int_a_SOURCES= $(libmysqld_sources)
+-nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources)
+-libmysqld_a_SOURCES=
+-
+-sqlstoragesources =	$(EXTRA_libmysqld_a_SOURCES)
+-storagesources = @condition_dependent_plugin_modules@
+-storageobjects = @condition_dependent_plugin_objects@
+-storagesourceslinks = @condition_dependent_plugin_links@
++sqlsources =	derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
++			ha_ndbcluster.cc ha_ndbcluster_cond.cc \
++			ha_ndbcluster_binlog.cc ha_partition.cc \
++			handler.cc sql_handler.cc \
++			hostname.cc init.cc password.c \
++			item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
++			item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
++			item_geofunc.cc item_subselect.cc item_row.cc\
++			item_xmlfunc.cc \
++			key.cc lock.cc log.cc sql_state.c \
++			log_event.cc rpl_record.cc \
++			log_event_old.cc rpl_record_old.cc \
++			protocol.cc net_serv.cc opt_range.cc \
++			opt_sum.cc procedure.cc records.cc sql_acl.cc \
++			sql_load.cc discover.cc sql_locale.cc \
++			sql_profile.cc \
++			sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
++			sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \
++			sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc \
++			scheduler.cc sql_connect.cc sql_parse.cc \
++			sql_prepare.cc sql_derived.cc sql_rename.cc \
++			sql_select.cc sql_do.cc sql_show.cc set_var.cc \
++			sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
++			sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
++			unireg.cc uniques.cc sql_union.cc hash_filo.cc \
++			spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
++			sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
++			parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
++			rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
++			debug_sync.cc \
++			sql_tablespace.cc \
++			rpl_injector.cc my_user.c partition_info.cc \
++			sql_servers.cc event_parse_data.cc
+ 
+ # automake misses these
+ sql_yacc.cc sql_yacc.$(YACC_HEXT): $(top_srcdir)/sql/sql_yacc.yy
+ 
+ # The following libraries should be included in libmysqld.a
+-INC_LIB=	$(top_builddir)/regex/libregex.a \
+-		$(top_builddir)/mysys/libmysys.a \
+-		$(top_builddir)/strings/libmystrings.a \
+-		$(top_builddir)/dbug/libdbug.a \
+-		$(top_builddir)/vio/libvio.a \
+-                @NDB_SCI_LIBS@ \
+-		@mysql_plugin_libs@ \
+-		$(yassl_inc_libs)
++INC_LIB=	$(top_builddir)/regex/libregex.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/strings/libmystrings.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/vio/libvio.la \
++			@ZLIB_LIBS@ @LIBDL@ \
++			$(NDB_SCI_LIBS) \
++			$(mysql_embedded_plugin_libs) \
++			$(yassl_inc_libs)
+ 
+ if HAVE_YASSL
+-yassl_inc_libs=	$(top_builddir)/extra/yassl/src/.libs/libyassl.a \
+-		$(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
++yassl_inc_libs=	$(top_builddir)/extra/yassl/src/libyassl.la \
++		$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
+ endif
+ 
++libmysqld_la_SOURCES=	$(libmysqld_sources)
++nodist_libmysqld_la_SOURCES=	$(libmysqlsources) $(sqlsources)
++libmysqld_la_LIBADD = 	$(INC_LIB)
++
+ # Storage engine specific compilation options
+ ha_ndbcluster.o:ha_ndbcluster.cc
+ 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+@@ -139,44 +135,6 @@ ha_myisam.o:ha_myisam.cc
+ ha_myisammrg.o:ha_myisammrg.cc
+ 		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+ 
+-#
+-# To make it easy for the end user to use the embedded library we
+-# generate a total libmysqld.a from all library files,
+-
+-# note - InnoDB libraries have circular dependencies, so in INC_LIB
+-# few libraries are present two times. Metrowerks linker doesn't like
+-# it at all. Traditional ar has no problems with it, but still there's no
+-# need to add the same file twice to the library, so 'sort -u' save us
+-# some time and spares unnecessary work.
+-
+-libmysqld.a:	libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES) $(storageobjects)
+-if DARWIN_MWCC
+-	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` $(storageobjects)
+-else
+-		-rm -f libmysqld.a
+-		if test "$(host_os)" = "netware" ; \
+-		then \
+-		  $(libmysqld_a_AR) libmysqld.a $(INC_LIB) libmysqld_int.a $(storageobjects); \
+-		else \
+-		  current_dir=`pwd`; \
+-		  rm -rf tmp; mkdir tmp; \
+-		  (for arc in $(INC_LIB) ./libmysqld_int.a; do \
+-		    arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
+-		    artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \
+-		    for F in `$(AR) t $$arc | grep -v SYMDEF`; do \
+-		      if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \
+-		      mkdir $$artmp; cd $$artmp > /dev/null; \
+-		      $(AR) x ../../$$arc; \
+-		      cd $$current_dir > /dev/null; \
+-		      ls $$artmp/* | grep -v SYMDEF; \
+-		      continue 2; fi; done; \
+-		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \
+-		  $(AR) r libmysqld.a $(storageobjects); \
+-		  $(RANLIB) libmysqld.a	; \
+-		  rm -rf tmp; \
+-		fi
+-endif
+-
+ ## XXX: any time the client interface changes, we'll need to bump
+ ## the version info for libmysqld; however, it's possible for the
+ ## libmysqld interface to change without affecting the standard
+@@ -187,7 +145,7 @@ endif
+ 
+ BUILT_SOURCES = link_sources
+ 
+-CLEANFILES = $(BUILT_SOURCES)
++CLEANFILES = libmysqld.la
+ 
+ link_sources:
+ 	  for f in $(sqlsources); do \
+@@ -208,20 +166,6 @@ link_sources:
+ 	      @LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \
+ 	    fi ; \
+ 	  done; \
+-	  if test -n "$(sqlstoragesources)" ; \
+-	  then \
+-	    for f in "$(sqlstoragesources)"; do \
+-	      rm -f "$$f"; \
+-	      @LN_CP_F@ `find $(srcdir)/../sql -name "$$f"` "$$f"; \
+-	    done; \
+-	  fi; \
+-	  if test -n "$(storagesources)" ; \
+-	  then \
+-	    rm -f $(storagesources); \
+-	    for f in $(storagesourceslinks); do \
+-	      @LN_CP_F@ $(top_srcdir)/$$f . ; \
+-	    done; \
+-	  fi; \
+ 	  rm -f client_settings.h; \
+ 	  @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h \
+                                           client_settings.h; \
+@@ -229,7 +173,7 @@ link_sources:
+ 
+ 
+ clean-local:
+-	rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"`; \
++	rm -f `echo $(sqlsources) $(libmysqlsources) | sed "s;\.lo;.c;g"`; \
+ 	rm -f client_settings.h
+ 
+ # Don't update the files from bitkeeper
+Index: libmysqld/examples/Makefile.am
+===================================================================
+--- libmysqld/examples/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ libmysqld/examples/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -37,12 +37,16 @@ INCLUDES =	-I$(top_builddir)/include -I$
+ 		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
+ 		$(openssl_includes)
+ LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
+-LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \
+-                @NDB_SCI_LIBS@
++LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @LIBDL@ $(CXXLDFLAGS) \
++                @NDB_SCI_LIBS@ \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/strings/libmystrings.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(ZLIB_LIBS)
+ 
+ mysqltest_embedded_LINK = $(CXXLINK)
+ nodist_mysqltest_embedded_SOURCES =	mysqltest.cc
+-mysqltest_embedded_LDADD =	$(LDADD) $(top_builddir)/regex/libregex.a \
++mysqltest_embedded_LDADD =	$(LDADD) $(top_builddir)/regex/libregex.la \
+ 				@MYSQLD_EXTRA_LDFLAGS@
+ 
+ nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
+Index: mysys/Makefile.am
+===================================================================
+--- mysys/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ mysys/Makefile.am	2010-11-27 19:42:49.000000000 +0100
+@@ -18,10 +18,10 @@ MYSQLSHAREdir =		$(pkgdatadir)
+ MYSQLBASEdir=		$(prefix)
+ INCLUDES =		@ZLIB_INCLUDES@ -I$(top_builddir)/include \
+ 			-I$(top_srcdir)/include -I$(srcdir)
+-pkglib_LIBRARIES =	libmysys.a
+-LDADD =			libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a
++noinst_LTLIBRARIES =	libmysys.la
++LDADD =			libmysys.la $(top_builddir)/strings/libmystrings.la $(top_builddir)/dbug/libdbug.la
+ noinst_HEADERS =	mysys_priv.h my_static.h my_handler_errors.h
+-libmysys_a_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
++libmysys_la_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
+ 			mf_path.c mf_loadpath.c my_file.c \
+ 			my_open.c my_create.c my_dup.c my_seek.c my_read.c \
+ 			my_pread.c my_write.c my_getpagesize.c \
+@@ -57,18 +57,18 @@ if NEED_THREAD
+ # mf_keycache is used only in the server, so it is safe to leave the file
+ # out of the non-threaded library.
+ # In fact, it will currently not compile without thread support.
+-libmysys_a_SOURCES +=   mf_keycache.c
++libmysys_la_SOURCES +=   thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c \
++			my_pthread.c my_thr_init.c mf_keycache.c
+ endif
+ 
+ EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
+ 			thr_mutex.c thr_rwlock.c \
+ 			CMakeLists.txt mf_soundex.c \
+ 			my_conio.c my_wincond.c my_winthread.c
+-libmysys_a_LIBADD =	@THREAD_LOBJECTS@
+-# test_dir_DEPENDENCIES=	$(LIBRARIES)
+-# testhash_DEPENDENCIES=	$(LIBRARIES)
+-# test_charset_DEPENDENCIES=	$(LIBRARIES)
+-# charset2html_DEPENDENCIES=	$(LIBRARIES)
++# test_dir_DEPENDENCIES=	$(LTLIBRARIES)
++# testhash_DEPENDENCIES=	$(LTLIBRARIES)
++# test_charset_DEPENDENCIES=	$(LTLIBRARIES)
++# charset2html_DEPENDENCIES=	$(LTLIBRARIES)
+ DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
+ 			-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
+ 			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
+@@ -78,8 +78,6 @@ DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\"
+ 			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
+                         @DEFS@
+ 
+-libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
+-
+ # I hope this always does the right thing. Otherwise this is only test programs
+ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
+ 
+@@ -88,47 +86,47 @@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(
+ # which automaticly removes the object files you use to compile a final program
+ #
+ 
+-test_bitmap$(EXEEXT): my_bitmap.c $(LIBRARIES)
++test_bitmap$(EXEEXT): my_bitmap.c $(LTLIBRARIES)
+ 	$(LINK) $(FLAGS) -DMAIN  ./my_bitmap.c $(LDADD) $(LIBS)
+ 
+-test_priority_queue$(EXEEXT): queues.c $(LIBRARIES)
++test_priority_queue$(EXEEXT): queues.c $(LTLIBRARIES)
+ 	$(LINK) $(FLAGS) -DMAIN  ./queues.c $(LDADD) $(LIBS)
+ 
+-test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)
++test_thr_alarm$(EXEEXT): thr_alarm.c $(LTLIBRARIES)
+ 	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
+ 	$(LINK) $(FLAGS) -DMAIN  ./test_thr_alarm.c $(LDADD) $(LIBS)
+ 	$(RM) -f ./test_thr_alarm.c
+ 
+-test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)
++test_thr_lock$(EXEEXT): thr_lock.c $(LTLIBRARIES)
+ 	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
+ 	$(LINK) $(FLAGS) -DMAIN  ./test_thr_lock.c $(LDADD) $(LIBS)
+ 	$(RM) -f ./test_thr_lock.c
+ 
+-test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)
++test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LTLIBRARIES)
+ 	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
+ 	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
+ 	$(RM) -f test_vsnprintf.c
+ 
+-test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES)
++test_io_cache$(EXEEXT): mf_iocache.c $(LTLIBRARIES)
+ 	$(CP) $(srcdir)/mf_iocache.c test_io_cache.c
+ 	$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)
+ 	$(RM) -f test_io_cache.c
+ 
+-test_dir$(EXEEXT): test_dir.c $(LIBRARIES)
++test_dir$(EXEEXT): test_dir.c $(LTLIBRARIES)
+ 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
+ 
+-test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
++test_charset$(EXEEXT): test_charset.c $(LTLIBRARIES)
+ 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
+ 
+-testhash$(EXEEXT): testhash.c $(LIBRARIES)
++testhash$(EXEEXT): testhash.c $(LTLIBRARIES)
+ 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
+ 
+-test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)
++test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LTLIBRARIES)
+ 	$(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c
+ 	$(LINK) $(FLAGS) -DMAIN  ./test_gethwaddr.c $(LDADD) $(LIBS)
+ 	$(RM) -f ./test_gethwaddr.c
+ 
+-test_base64$(EXEEXT): base64.c $(LIBRARIES)
++test_base64$(EXEEXT): base64.c $(LTLIBRARIES)
+ 	$(CP) $(srcdir)/base64.c ./test_base64.c
+ 	$(LINK) $(FLAGS) -DMAIN  ./test_base64.c $(LDADD) $(LIBS)
+ 	$(RM) -f ./test_base64.c
+Index: netware/BUILD/compile-linux-tools
+===================================================================
+--- netware/BUILD/compile-linux-tools.orig	2010-11-27 15:02:45.000000000 +0100
++++ netware/BUILD/compile-linux-tools	2010-11-27 15:02:49.000000000 +0100
+@@ -34,14 +34,14 @@ make
+ # Create mysql_version.h which was deleted my previous step
+ ./config.status include/mysql_version.h
+                                                                                                                              
+-(cd dbug; make libdbug.a)
+-(cd strings; make libmystrings.a)
+-(cd mysys; make libmysys.a)
+-(cd storage/heap; make libheap.a)
+-(cd vio; make libvio.a)
+-(cd regex; make libregex.a)
+-(cd storage/myisam; make libmyisam.a)
+-(cd storage/myisammrg; make libmyisammrg.a)
++(cd dbug; make libdbug.la)
++(cd strings; make libmystrings.la)
++(cd mysys; make libmysys.la)
++(cd storage/heap; make libheap.la)
++(cd vio; make libvio.la)
++(cd regex; make libregex.la)
++(cd storage/myisam; make libmyisam.la)
++(cd storage/myisammrg; make libmyisammrg.la)
+ (cd extra; make comp_err)
+ (cd libmysql; make conf_to_src)
+ (cd libmysql_r; make conf_to_src)
+Index: netware/Makefile.am
+===================================================================
+--- netware/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ netware/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -16,8 +16,8 @@
+ 
+ if HAVE_NETWARE
+ INCLUDES =			-I$(top_builddir)/include -I$(top_srcdir)/include -I..
+-LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
+-				../dbug/libdbug.a ../strings/libmystrings.a
++LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \
++				../dbug/libdbug.la ../strings/libmystrings.la
+ bin_PROGRAMS =			mysqld_safe mysql_install_db mysql_test_run libmysql
+ mysqld_safe_SOURCES=		mysqld_safe.c my_manage.c
+ mysql_install_db_SOURCES=	mysql_install_db.c my_manage.c
+Index: regex/Makefile.am
+===================================================================
+--- regex/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ regex/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -16,10 +16,10 @@
+ # MA 02111-1307, USA
+ 
+ INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
+-noinst_LIBRARIES =	libregex.a
+-LDADD=			libregex.a $(top_builddir)/strings/libmystrings.a
++noinst_LTLIBRARIES =	libregex.la
++LDADD=			libregex.la $(top_builddir)/strings/libmystrings.la
+ noinst_HEADERS =	cclass.h cname.h regex2.h utils.h engine.c my_regex.h
+-libregex_a_SOURCES =	regerror.c regcomp.c regexec.c regfree.c reginit.c
++libregex_la_SOURCES =	regerror.c regcomp.c regexec.c regfree.c reginit.c
+ noinst_PROGRAMS =	re
+ re_SOURCES =		split.c debug.c main.c
+ re_LDFLAGS= @NOINST_LDFLAGS@
+Index: server-tools/instance-manager/Makefile.am
+===================================================================
+--- server-tools/instance-manager/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ server-tools/instance-manager/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -87,10 +87,10 @@ mysqlmanager_SOURCES=	command.cc command
+ mysqlmanager_LDADD=	@CLIENT_EXTRA_LDFLAGS@ \
+ 			liboptions.la \
+ 			libnet.a \
+-			$(top_builddir)/vio/libvio.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/strings/libmystrings.a \
+-			$(top_builddir)/dbug/libdbug.a \
++			$(top_builddir)/vio/libvio.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/strings/libmystrings.la \
++			$(top_builddir)/dbug/libdbug.la \
+ 			@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
+ 
+ EXTRA_DIST =		WindowsService.cpp WindowsService.h IMService.cpp \
+Index: sql/Makefile.am
+===================================================================
+--- sql/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ sql/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -32,13 +32,13 @@ bin_PROGRAMS =		mysql_tzinfo_to_sql
+ noinst_LTLIBRARIES=	libndb.la \
+ 			udf_example.la
+ 
+-SUPPORTING_LIBS =	$(top_builddir)/vio/libvio.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/regex/libregex.a \
+-			$(top_builddir)/strings/libmystrings.a
++SUPPORTING_LIBS =	$(top_builddir)/vio/libvio.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/regex/libregex.la \
++			$(top_builddir)/strings/libmystrings.la
+ mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
+-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
++LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@ $(openssl_libs) $(yassl_libs)
+ mysqld_LDADD =		libndb.la \
+ 			@MYSQLD_EXTRA_LDFLAGS@ \
+ 			@pstack_libs@ \
+Index: storage/archive/Makefile.am
+===================================================================
+--- storage/archive/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/archive/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -33,7 +33,7 @@ DEFS =                  @DEFS@
+ noinst_HEADERS =	ha_archive.h azlib.h
+ noinst_PROGRAMS	=	archive_test archive_reader
+ 
+-EXTRA_LTLIBRARIES =	ha_archive.la
++EXTRA_LTLIBRARIES =	libarchive.la ha_archive.la
+ pkgplugin_LTLIBRARIES =	@plugin_archive_shared_target@
+ ha_archive_la_LDFLAGS =	-module -rpath $(pkgplugindir)
+ ha_archive_la_CXXFLAGS=	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+@@ -41,26 +41,25 @@ ha_archive_la_CFLAGS =	$(AM_CFLAGS) -DMY
+ ha_archive_la_SOURCES =	ha_archive.cc azio.c
+ 
+ 
+-EXTRA_LIBRARIES =	libarchive.a
+-noinst_LIBRARIES =	@plugin_archive_static_target@
+-libarchive_a_CXXFLAGS =	$(AM_CXXFLAGS)
+-libarchive_a_CFLAGS =	$(AM_CFLAGS)
+-libarchive_a_SOURCES =	ha_archive.cc azio.c
++noinst_LTLIBRARIES =	@plugin_archive_static_target@
++libarchive_la_CXXFLAGS =	$(AM_CXXFLAGS) @plugin_static_if_no_embedded@
++libarchive_la_CFLAGS =	$(AM_CFLAGS) @plugin_static_if_no_embedded@
++libarchive_la_SOURCES =	ha_archive.cc azio.c
+ 
+ 
+ archive_test_SOURCES =	archive_test.c azio.c
+ archive_test_CFLAGS =	$(AM_CFLAGS)
+-archive_test_LDADD =	$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a \
++archive_test_LDADD =	$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la \
+ 			@ZLIB_LIBS@
+ archive_test_LDFLAGS = @NOINST_LDFLAGS@
+ 
+ archive_reader_SOURCES = archive_reader.c azio.c
+ archive_reader_CFLAGS =	$(AM_CFLAGS)
+-archive_reader_LDADD =	$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a \
++archive_reader_LDADD =	$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la \
+ 			@ZLIB_LIBS@
+ archive_reader_LDFLAGS = @NOINST_LDFLAGS@
+ 
+Index: storage/archive/plug.in
+===================================================================
+--- storage/archive/plug.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/archive/plug.in	2010-11-27 15:02:49.000000000 +0100
+@@ -1,4 +1,4 @@
+ MYSQL_STORAGE_ENGINE(archive,,  [Archive Storage Engine],
+         [Archive Storage Engine], [max,max-no-ndb])
+-MYSQL_PLUGIN_STATIC(archive,    [libarchive.a])
++MYSQL_PLUGIN_STATIC(archive,    [libarchive.la])
+ MYSQL_PLUGIN_DYNAMIC(archive,   [ha_archive.la])
+Index: storage/blackhole/Makefile.am
+===================================================================
+--- storage/blackhole/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/blackhole/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -32,7 +32,7 @@ DEFS =                  @DEFS@
+ 
+ noinst_HEADERS =	ha_blackhole.h
+ 
+-EXTRA_LTLIBRARIES =	ha_blackhole.la
++EXTRA_LTLIBRARIES =	libblackhole.la ha_blackhole.la
+ pkgplugin_LTLIBRARIES =	@plugin_blackhole_shared_target@
+ ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
+ ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+@@ -40,11 +40,10 @@ ha_blackhole_la_CFLAGS=	$(AM_CFLAGS) -DM
+ ha_blackhole_la_SOURCES=ha_blackhole.cc
+ 
+ 
+-EXTRA_LIBRARIES =	libblackhole.a
+-noinst_LIBRARIES =	@plugin_blackhole_static_target@
+-libblackhole_a_CXXFLAGS=$(AM_CXXFLAGS)
+-libblackhole_a_CFLAGS =	$(AM_CFLAGS)
+-libblackhole_a_SOURCES=	ha_blackhole.cc
++noinst_LTLIBRARIES =	@plugin_blackhole_static_target@
++libblackhole_la_CXXFLAGS=$(AM_CXXFLAGS)  @plugin_static_if_no_embedded@
++libblackhole_la_CFLAGS =	$(AM_CFLAGS) @plugin_static_if_no_embedded@
++libblackhole_la_SOURCES=	ha_blackhole.cc
+ 
+ 
+ EXTRA_DIST =		CMakeLists.txt plug.in
+Index: storage/blackhole/plug.in
+===================================================================
+--- storage/blackhole/plug.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/blackhole/plug.in	2010-11-27 15:02:49.000000000 +0100
+@@ -1,6 +1,6 @@
+ MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
+         [Basic Write-only Read-never tables], [max,max-no-ndb])
+ MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])
+-MYSQL_PLUGIN_STATIC(blackhole,  [libblackhole.a])
++MYSQL_PLUGIN_STATIC(blackhole,  [libblackhole.la])
+ MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])
+ 
+Index: storage/csv/Makefile.am
+===================================================================
+--- storage/csv/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/csv/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -29,16 +29,15 @@ LDADD =
+ DEFS =	@DEFS@
+ noinst_HEADERS	  =	ha_tina.h transparent_file.h
+ 
+-EXTRA_LTLIBRARIES =	ha_csv.la
++EXTRA_LTLIBRARIES =	libcsv.la ha_csv.la
+ pkglib_LTLIBRARIES =	@plugin_csv_shared_target@
+ ha_csv_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
+ ha_csv_la_CXXFLAGS =	$(AM_CXXFLAGS) -DMYSQL_PLUGIN
+ ha_csv_la_SOURCES =	transparent_file.cc ha_tina.cc 
+ 
+-EXTRA_LIBRARIES =	libcsv.a
+-noinst_LIBRARIES =	@plugin_csv_static_target@
+-libcsv_a_CXXFLAGS =	$(AM_CXXFLAGS)
+-libcsv_a_SOURCES =	transparent_file.cc ha_tina.cc
++noinst_LTLIBRARIES =	@plugin_csv_static_target@
++libcsv_la_CXXFLAGS =	$(AM_CXXFLAGS)  @plugin_static_if_no_embedded@
++libcsv_la_SOURCES =	transparent_file.cc ha_tina.cc
+ 
+ EXTRA_DIST =		CMakeLists.txt plug.in
+ # Don't update the files from bitkeeper
+Index: storage/csv/plug.in
+===================================================================
+--- storage/csv/plug.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/csv/plug.in	2010-11-27 15:02:49.000000000 +0100
+@@ -1,5 +1,5 @@
+ MYSQL_STORAGE_ENGINE(csv,,      [CSV Storage Engine],
+         [Stores tables in text CSV format])
+ MYSQL_PLUGIN_DIRECTORY(csv,     [storage/csv])
+-MYSQL_PLUGIN_STATIC(csv,        [libcsv.a])
++MYSQL_PLUGIN_STATIC(csv,        [libcsv.la])
+ MYSQL_PLUGIN_MANDATORY(csv)     dnl Used for logging
+Index: storage/example/Makefile.am
+===================================================================
+--- storage/example/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/example/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -32,7 +32,7 @@ DEFS =                  @DEFS@
+ 
+ noinst_HEADERS =	ha_example.h
+ 
+-EXTRA_LTLIBRARIES =	ha_example.la
++EXTRA_LTLIBRARIES =	libexample.la ha_example.la
+ pkgplugin_LTLIBRARIES =	@plugin_example_shared_target@
+ ha_example_la_LDFLAGS =	-module -rpath $(pkgplugindir)
+ ha_example_la_CXXFLAGS=	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+@@ -40,11 +40,10 @@ ha_example_la_CFLAGS =	$(AM_CFLAGS) -DMY
+ ha_example_la_SOURCES =	ha_example.cc
+ 
+ 
+-EXTRA_LIBRARIES =	libexample.a
+-noinst_LIBRARIES =	@plugin_example_static_target@
+-libexample_a_CXXFLAGS =	$(AM_CXXFLAGS)
+-libexample_a_CFLAGS =	$(AM_CFLAGS)
+-libexample_a_SOURCES=	ha_example.cc
++noinst_LTLIBRARIES =	@plugin_example_static_target@
++libexample_la_CXXFLAGS =	$(AM_CXXFLAGS)  @plugin_static_if_no_embedded@
++libexample_la_CFLAGS =	$(AM_CFLAGS)  @plugin_static_if_no_embedded@
++libexample_la_SOURCES=	ha_example.cc
+ 
+ 
+ EXTRA_DIST =		CMakeLists.txt plug.in
+Index: storage/federated/Makefile.am
+===================================================================
+--- storage/federated/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/federated/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -32,7 +32,7 @@ DEFS =                  @DEFS@
+ 
+ noinst_HEADERS =	ha_federated.h
+ 
+-EXTRA_LTLIBRARIES =	ha_federated.la
++EXTRA_LTLIBRARIES =	libfederated.la libfederated_embedded.la ha_federated.la
+ pkgplugin_LTLIBRARIES =	@plugin_federated_shared_target@
+ ha_federated_la_LDFLAGS =	-module -rpath $(pkgplugindir)
+ ha_federated_la_CXXFLAGS=	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+@@ -40,11 +40,14 @@ ha_federated_la_CFLAGS =	$(AM_CFLAGS) -D
+ ha_federated_la_SOURCES =	ha_federated.cc $(top_srcdir)/mysys/string.c
+ 
+ 
+-EXTRA_LIBRARIES =	libfederated.a
+-noinst_LIBRARIES =	@plugin_federated_static_target@
+-libfederated_a_CXXFLAGS =	$(AM_CXXFLAGS)
+-libfederated_a_CFLAGS =	$(AM_CFLAGS)
+-libfederated_a_SOURCES=	ha_federated.cc $(top_srcdir)/mysys/string.c
++noinst_LTLIBRARIES =	@plugin_federated_static_target@ @plugin_federated_embedded_static_target@
++libfederated_la_CXXFLAGS =	$(AM_CXXFLAGS) @plugin_static_if_no_embedded@
++libfederated_la_CFLAGS =	$(AM_CFLAGS) @plugin_static_if_no_embedded@
++libfederated_la_SOURCES=	ha_federated.cc $(top_srcdir)/mysys/string.c
++
++libfederated_embedded_la_CXXFLAGS =    $(AM_CXXFLAGS) @plugin_embedded_defs@
++libfederated_embedded_la_CFLAGS =  $(AM_CFLAGS) @plugin_embedded_defs@
++libfederated_embedded_la_SOURCES=  ha_federated.cc $(top_srcdir)/mysys/string.c
+ 
+ 
+ EXTRA_DIST =		CMakeLists.txt plug.in
+Index: storage/federated/plug.in
+===================================================================
+--- storage/federated/plug.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/federated/plug.in	2010-11-27 15:02:49.000000000 +0100
+@@ -1,5 +1,4 @@
+ MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
+         [Connects to tables on remote MySQL servers], [max,max-no-ndb])
+-MYSQL_PLUGIN_STATIC(federated,    [libfederated.a])
++MYSQL_PLUGIN_STATIC(federated,    [libfederated.la], [libfederated_embedded.la])
+ MYSQL_PLUGIN_DYNAMIC(federated,   [ha_federated.la])
+-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federated.cc])
+Index: storage/heap/Makefile.am
+===================================================================
+--- storage/heap/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/heap/Makefile.am	2010-11-27 19:44:23.000000000 +0100
+@@ -26,27 +26,40 @@ WRAPLIBS=
+ LDADD =
+ 
+ DEFS =                  @DEFS@
+-pkglib_LIBRARIES =	libheap.a
++noinst_LTLIBRARIES =	libheap.la libheap_s.la libheap_common.la \
++			@plugin_heap_embedded_static_target@
++EXTRA_LTLIBRARIES =	libheap_embedded.la
++
+ noinst_PROGRAMS	=	hp_test1 hp_test2
+-noinst_LIBRARIES =	libheap.a
+ hp_test1_LDFLAGS = @NOINST_LDFLAGS@
+-hp_test1_LDADD =	libheap.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a
++hp_test1_LDADD =	libheap.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la
+ hp_test2_LDFLAGS = @NOINST_LDFLAGS@
+-hp_test2_LDADD =	libheap.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a
++hp_test2_LDADD =	libheap.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la
+ noinst_HEADERS =	heapdef.h ha_heap.h
+-libheap_a_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
++libheap_common_la_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
+ 			hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
+ 			hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
+ 			hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
+ 			hp_rkey.c hp_block.c \
+-			ha_heap.cc \
+ 			hp_hash.c _check.c _rectest.c hp_static.c
++libheap_common_la_CFLAGS =	$(AM_LDFLAGS) @plugin_static_if_no_embedded@
++
++libheap_s_la_SOURCES =	ha_heap.cc
++libheap_s_la_CFLAGS =	$(AM_CFLAGS) @plugin_static_if_no_embedded@
++libheap_s_la_CXXFLAGS =	$(AM_CXXFLAGS) @plugin_static_if_no_embedded@
++libheap_s_la_LIBADD =	libheap_common.la
++libheap_embedded_la_SOURCES =	ha_heap.cc
++libheap_embedded_la_LIBADD =	libheap_common.la
++libheap_embedded_la_CXXFLAGS =	@plugin_embedded_defs@
++libheap_la_SOURCES =	
++libheap_la_LIBADD =	libheap_s.la
++libheap_la_LDFLAGS =	-static
+ 
+ 
+ EXTRA_DIST =		CMakeLists.txt plug.in
+Index: storage/heap/plug.in
+===================================================================
+--- storage/heap/plug.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/heap/plug.in	2010-11-27 15:02:49.000000000 +0100
+@@ -1,7 +1,6 @@
+ MYSQL_STORAGE_ENGINE(heap,no,   [Memory Storage Engine],
+         [Volatile memory based tables])
+ MYSQL_PLUGIN_DIRECTORY(heap,    [storage/heap])
+-MYSQL_PLUGIN_STATIC(heap,       [libheap.a])
++MYSQL_PLUGIN_STATIC(heap,       [libheap_s.la], [libheap_embedded.la])
+ MYSQL_PLUGIN_MANDATORY(heap)    dnl Memory tables
+-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(heap, [ha_heap.cc])
+ 
+Index: storage/innobase/Makefile.am
+===================================================================
+--- storage/innobase/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/innobase/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -15,21 +15,20 @@
+ 
+ # Process this file with automake to create Makefile.in
+ 
+-MYSQLDATAdir=		$(localstatedir)
+-MYSQLSHAREdir=		$(pkgdatadir)
+-MYSQLBASEdir=		$(prefix)
+-MYSQLLIBdir=		$(pkglibdir)
+-pkgplugindir=		$(pkglibdir)/plugin
+-INCLUDES=		-I$(top_srcdir)/include -I$(top_builddir)/include \
++MYSQLDATAdir =	$(localstatedir)
++MYSQLSHAREdir =	$(pkgdatadir)
++MYSQLBASEdir =	$(prefix)
++MYSQLLIBdir =	$(pkglibdir)
++pkgplugindir =	$(pkglibdir)/plugin
++INCLUDES =	-I$(top_srcdir)/include -I$(top_builddir)/include \
+ 			-I$(top_srcdir)/regex \
+ 			-I$(top_srcdir)/storage/innobase/include \
+ 			-I$(top_srcdir)/sql \
+ 			-I$(srcdir)
+ 
+-DEFS=			@DEFS@
++DEFS=	@DEFS@
+ 
+-
+-noinst_HEADERS=		include/btr0btr.h include/btr0btr.ic		\
++noinst_HEADERS =	include/btr0btr.h include/btr0btr.ic		\
+ 			include/btr0cur.h include/btr0cur.ic		\
+ 			include/btr0pcur.h include/btr0pcur.ic		\
+ 			include/btr0sea.h include/btr0sea.ic		\
+@@ -122,9 +121,8 @@ noinst_HEADERS=		include/btr0btr.h inclu
+ 			include/ut0list.ic include/ut0wqueue.h		\
+ 			include/ha_prototypes.h handler/ha_innodb.h
+ 
+-EXTRA_LIBRARIES=	libinnobase.a
+-noinst_LIBRARIES=	@plugin_innobase_static_target@
+-libinnobase_a_SOURCES=	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c	\
++noinst_LTLIBRARIES =	@plugin_innobase_static_target@
++libinnobase_la_SOURCES =	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c	\
+ 			btr/btr0sea.c buf/buf0buf.c buf/buf0flu.c	\
+ 			buf/buf0lru.c buf/buf0rea.c data/data0data.c	\
+ 			data/data0type.c dict/dict0boot.c		\
+@@ -156,18 +154,18 @@ libinnobase_a_SOURCES=	btr/btr0btr.c btr
+ 			ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c		\
+ 			handler/ha_innodb.cc
+ 
+-libinnobase_a_CXXFLAGS=	$(AM_CXXFLAGS)
+-libinnobase_a_CFLAGS=	$(AM_CFLAGS)
++libinnobase_la_CXXFLAGS =	$(AM_CXXFLAGS)
++libinnobase_la_CFLAGS =	$(AM_CFLAGS)
+ 
+-EXTRA_LTLIBRARIES=	ha_innodb.la
+-pkgplugin_LTLIBRARIES=	@plugin_innobase_shared_target@
++EXTRA_LTLIBRARIES =	libinnobase.la ha_innodb.la
++pkgplugin_LTLIBRARIES =	@plugin_innobase_shared_target@
+ 
+-ha_innodb_la_LDFLAGS=	-module -rpath $(pkgplugindir)
+-ha_innodb_la_CXXFLAGS=	$(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+-ha_innodb_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+-ha_innodb_la_SOURCES=	$(libinnobase_a_SOURCES)
++ha_innodb_la_LDFLAGS =	-module -rpath $(pkgplugindir)
++ha_innodb_la_CXXFLAGS =	$(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
++ha_innodb_la_CFLAGS =	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
++ha_innodb_la_SOURCES =	$(libinnobase_la_SOURCES)
+ 
+-EXTRA_DIST=		CMakeLists.txt plug.in \
++EXTRA_DIST =	CMakeLists.txt plug.in \
+ 			pars/make_bison.sh pars/make_flex.sh \
+ 			pars/pars0grm.y pars/pars0lex.l
+ 
+Index: storage/innobase/plug.in
+===================================================================
+--- storage/innobase/plug.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/innobase/plug.in	2010-11-27 15:02:49.000000000 +0100
+@@ -1,7 +1,7 @@
+ MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
+         [Transactional Tables using InnoDB], [max,max-no-ndb])
+ MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
+-MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])
++MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.la])
+ MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])
+ MYSQL_PLUGIN_ACTIONS(innobase,  [
+   AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
+Index: storage/innodb_plugin/Makefile.am
+===================================================================
+--- storage/innodb_plugin/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/innodb_plugin/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -228,9 +228,8 @@ noinst_HEADERS=		\
+ 			include/ut0wqueue.h	\
+ 			mem/mem0dbg.c
+ 
+-EXTRA_LIBRARIES=	libinnobase.a
+-noinst_LIBRARIES=	@plugin_innodb_plugin_static_target@
+-libinnobase_a_SOURCES=	\
++noinst_LTLIBRARIES=	@plugin_innodb_plugin_static_target@
++libinnobase_la_SOURCES=	\
+ 			btr/btr0btr.c			\
+ 			btr/btr0cur.c			\
+ 			btr/btr0pcur.c			\
+@@ -325,16 +324,16 @@ libinnobase_a_SOURCES=	\
+ 			ut/ut0vec.c			\
+ 			ut/ut0wqueue.c
+ 
+-libinnobase_a_CXXFLAGS=	$(AM_CXXFLAGS)
+-libinnobase_a_CFLAGS=	$(AM_CFLAGS)
++libinnobase_la_CXXFLAGS=	$(AM_CXXFLAGS) @plugin_static_if_no_embedded@
++libinnobase_la_CFLAGS=	$(AM_CFLAGS) @plugin_static_if_no_embedded@
+ 
+-EXTRA_LTLIBRARIES=	ha_innodb_plugin.la
++EXTRA_LTLIBRARIES=	libinnobase.la ha_innodb_plugin.la
+ pkgplugin_LTLIBRARIES=	@plugin_innodb_plugin_shared_target@
+ 
+ ha_innodb_plugin_la_LDFLAGS=	-module -rpath $(pkgplugindir)
+ ha_innodb_plugin_la_CXXFLAGS=	$(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+-ha_innodb_plugin_la_SOURCES=	$(libinnobase_a_SOURCES)
++ha_innodb_plugin_la_SOURCES=	$(libinnobase_la_SOURCES)
+ 
+ EXTRA_DIST=		CMakeLists.txt plug.in \
+ 			pars/make_bison.sh pars/make_flex.sh \
+Index: storage/myisam/Makefile.am
+===================================================================
+--- storage/myisam/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/myisam/Makefile.am	2010-11-27 19:44:01.000000000 +0100
+@@ -30,60 +30,63 @@ DEFS =                  @DEFS@
+ EXTRA_DIST =		mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in
+ pkgdata_DATA =		mi_test_all mi_test_all.res
+ 
+-pkglib_LIBRARIES =	libmyisam.a
++noinst_LTLIBRARIES =	libmyisam.la libmyisam_common.la libmyisam_s.la \
++			@plugin_myisam_embedded_static_target@
++EXTRA_LTLIBRARIES =	libmyisam_embedded.la
++
+ bin_PROGRAMS =		myisamchk myisamlog myisampack myisam_ftdump
+-myisamchk_DEPENDENCIES=	$(LIBRARIES)
+-myisamchk_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+-myisamlog_DEPENDENCIES=	$(LIBRARIES)
+-myisamlog_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+-myisampack_DEPENDENCIES=$(LIBRARIES)
+-myisampack_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
++myisamchk_DEPENDENCIES=	$(LTLIBRARIES)
++myisamchk_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
++myisamlog_DEPENDENCIES=	$(LTLIBRARIES)
++myisamlog_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
++myisampack_DEPENDENCIES=$(LTLIBRARIES)
++myisampack_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
+ noinst_PROGRAMS =	mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
+ noinst_HEADERS =	myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \
+ 			fulltext.h ftdefs.h ft_test1.h ft_eval.h \
+ 			ha_myisam.h
+-mi_test1_DEPENDENCIES=	$(LIBRARIES)
+-mi_test1_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+-mi_test2_DEPENDENCIES=	$(LIBRARIES)
+-mi_test2_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+-mi_test3_DEPENDENCIES=	$(LIBRARIES)
+-mi_test3_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+-#ft_test1_DEPENDENCIES=	$(LIBRARIES)
+-#ft_eval_DEPENDENCIES=	$(LIBRARIES)
+-myisam_ftdump_DEPENDENCIES=	$(LIBRARIES)
+-myisam_ftdump_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+-rt_test_DEPENDENCIES=	$(LIBRARIES)
+-rt_test_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+-sp_test_DEPENDENCIES=	$(LIBRARIES)
+-sp_test_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
+-			$(top_builddir)/mysys/libmysys.a \
+-			$(top_builddir)/dbug/libdbug.a \
+-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+-libmyisam_a_SOURCES =	mi_open.c mi_extra.c mi_info.c mi_rkey.c \
++mi_test1_DEPENDENCIES=	$(LTLIBRARIES)
++mi_test1_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
++mi_test2_DEPENDENCIES=	$(LTLIBRARIES)
++mi_test2_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
++mi_test3_DEPENDENCIES=	$(LTLIBRARIES)
++mi_test3_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
++#ft_test1_DEPENDENCIES=	$(LTLIBRARIES)
++#ft_eval_DEPENDENCIES=	$(LTLIBRARIES)
++myisam_ftdump_DEPENDENCIES=	$(LTLIBRARIES)
++myisam_ftdump_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
++rt_test_DEPENDENCIES=	$(LTLIBRARIES)
++rt_test_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
++sp_test_DEPENDENCIES=	$(LTLIBRARIES)
++sp_test_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
++libmyisam_common_la_SOURCES =	mi_open.c mi_extra.c mi_info.c mi_rkey.c \
+ 			mi_rnext.c mi_rnext_same.c \
+ 			mi_search.c mi_page.c mi_key.c mi_locking.c \
+ 			mi_rrnd.c mi_scan.c mi_cache.c \
+@@ -98,8 +101,23 @@ libmyisam_a_SOURCES =	mi_open.c mi_extra
+ 			mi_keycache.c mi_preload.c \
+ 			ft_parser.c ft_stopwords.c ft_static.c \
+ 			ft_update.c ft_boolean_search.c ft_nlq_search.c sort.c \
+-			ha_myisam.cc \
+ 			rt_index.c rt_key.c rt_mbr.c rt_split.c sp_key.c
++libmyisam_common_la_CFLAGS =	$(AM_CFLAGS) @plugin_static_if_no_embedded@
++libmyisam_s_la_SOURCES =	ha_myisam.cc
++libmyisam_s_la_CXXFLAGS =	$(AM_CXXFLAGS) @plugin_static_if_no_embedded@
++libmyisam_s_la_LIBADD =	libmyisam_common.la
++libmyisam_embedded_la_SOURCES =	ha_myisam.cc
++libmyisam_embedded_la_LIBADD =	libmyisam_common.la
++libmyisam_embedded_la_CXXFLAGS =	$(AM_CXXFLAGS) @plugin_embedded_defs@
++# libmyisam  references symbols inside mysqld.
++# This means we cannot use it as shared library, as these references causes
++# undefined symbol errors at load time.
++# But a static library works (as long as those parts that references
++# problematic symbols are not linked).
++libmyisam_la_LDFLAGS =	-static
++libmyisam_la_SOURCES = 
++libmyisam_la_LIBADD =	libmyisam_s.la
++
+ CLEANFILES =		test?.MY? FT?.MY? isam.log mi_test_all rt_test.MY? sp_test.MY?
+ 
+ # Move to automake rules ?
+Index: storage/myisam/plug.in
+===================================================================
+--- storage/myisam/plug.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/myisam/plug.in	2010-11-27 15:02:49.000000000 +0100
+@@ -1,7 +1,5 @@
+ MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
+         [Traditional non-transactional MySQL tables])
+ MYSQL_PLUGIN_DIRECTORY(myisam,  [storage/myisam])
+-MYSQL_PLUGIN_STATIC(myisam,     [libmyisam.a])
++MYSQL_PLUGIN_STATIC(myisam,     [libmyisam_s.la], [libmyisam_embedded.la])
+ MYSQL_PLUGIN_MANDATORY(myisam)  dnl Default
+-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisam, [ha_myisam.cc])
+-
+Index: storage/myisammrg/Makefile.am
+===================================================================
+--- storage/myisammrg/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/myisammrg/Makefile.am	2010-11-27 19:43:39.000000000 +0100
+@@ -26,16 +26,28 @@ WRAPLIBS=
+ LDADD =
+ 
+ DEFS =                  @DEFS@
+-pkglib_LIBRARIES =	libmyisammrg.a
++noinst_LTLIBRARIES =	libmyisammrg.la libmyisammrg_s.la libmyisammrg_common.la \
++			@plugin_myisammrg_embedded_static_target@
++EXTRA_LTLIBRARIES =	libmyisammrg_embedded.la
+ noinst_HEADERS =	myrg_def.h ha_myisammrg.h
+-noinst_LIBRARIES =	libmyisammrg.a
+-libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
++libmyisammrg_common_la_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
+ 			myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
+ 			myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
+ 			myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
+ 			myrg_rprev.c myrg_queue.c myrg_write.c myrg_range.c \
+-			ha_myisammrg.cc \
+ 			myrg_rnext_same.c myrg_records.c
++libmyisammrg_common_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@
++libmyisammrg_s_la_SOURCES = ha_myisammrg.cc
++libmyisammrg_s_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
++libmyisammrg_s_la_LIBADD = libmyisammrg_common.la
++libmyisammrg_embedded_la_SOURCES = ha_myisammrg.cc
++libmyisammrg_embedded_la_CFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@
++libmyisammrg_embedded_la_LIBADD = libmyisammrg_common.la
++libmyisammrg_embedded_la_CXXFLAGS =	$(AM_CXXFLAGS) @plugin_embedded_defs@
++libmyisammrg_la_SOURCES =	
++libmyisammrg_la_LIBADD =	libmyisammrg_s.la
++libmyisammrg_la_LDFLAGS =	-static
++
+ 
+ 
+ EXTRA_DIST =		CMakeLists.txt plug.in
+Index: storage/myisammrg/plug.in
+===================================================================
+--- storage/myisammrg/plug.in.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/myisammrg/plug.in	2010-11-27 15:02:49.000000000 +0100
+@@ -1,6 +1,5 @@
+ MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
+         [Merge multiple MySQL tables into one])
+ MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])
+-MYSQL_PLUGIN_STATIC(myisammrg,  [libmyisammrg.a])
++MYSQL_PLUGIN_STATIC(myisammrg,  [libmyisammrg_s.la], [libmyisammrg_embedded.la])
+ MYSQL_PLUGIN_MANDATORY(myisammrg)
+-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisammrg, [ha_myisammrg.cc])
+Index: storage/ndb/src/common/util/Makefile.am
+===================================================================
+--- storage/ndb/src/common/util/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/common/util/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -31,9 +31,9 @@ EXTRA_PROGRAMS = testBitmask
+ testBitmask_SOURCES =  testBitmask.cpp
+ testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
+   $(top_builddir)/storage/ndb/src/libndbclient.la \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a
++         $(top_builddir)/dbug/libdbug.la \
++         $(top_builddir)/mysys/libmysys.la \
++         $(top_builddir)/strings/libmystrings.la
+ 
+ testBitmask.cpp : Bitmask.cpp
+ 	rm -f testBitmask.cpp
+Index: storage/ndb/config/type_ndbapitest.mk.am
+===================================================================
+--- storage/ndb/config/type_ndbapitest.mk.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/config/type_ndbapitest.mk.am	2010-11-27 15:02:49.000000000 +0100
+@@ -13,19 +13,20 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+-LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
+-         $(top_builddir)/storage/ndb/src/libndbclient.la \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
++LDADD +=	$(top_builddir)/storage/ndb/test/src/libNDBT.a \
++		$(top_builddir)/storage/ndb/src/libndbclient.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ \
++		$(ZLIB_LIBS)
+ 
+-INCLUDES += -I$(top_srcdir) \
+-	-I$(top_builddir)/include \
+-	-I$(top_builddir)/storage/ndb/include \
+-	-I$(top_srcdir)/include \
+-	-I$(top_srcdir)/storage/ndb/include \
+-        -I$(top_srcdir)/storage/ndb/include/ndbapi \
+-        -I$(top_srcdir)/storage/ndb/include/util \
+-        -I$(top_srcdir)/storage/ndb/include/portlib \
+-        -I$(top_srcdir)/storage/ndb/test/include \
+-        -I$(top_srcdir)/storage/ndb/include/mgmapi
++INCLUDES +=	-I$(top_srcdir) \
++		-I$(top_builddir)/include \
++		-I$(top_builddir)/storage/ndb/include \
++		-I$(top_srcdir)/include \
++		-I$(top_srcdir)/storage/ndb/include \
++		-I$(top_srcdir)/storage/ndb/include/ndbapi \
++		-I$(top_srcdir)/storage/ndb/include/util \
++		-I$(top_srcdir)/storage/ndb/include/portlib \
++		-I$(top_srcdir)/storage/ndb/test/include \
++		-I$(top_srcdir)/storage/ndb/include/mgmapi
+Index: storage/ndb/config/type_ndbapitools.mk.am
+===================================================================
+--- storage/ndb/config/type_ndbapitools.mk.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/config/type_ndbapitools.mk.am	2010-11-27 15:02:49.000000000 +0100
+@@ -13,20 +13,21 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+-LDADD += \
+-         $(top_builddir)/storage/ndb/src/libndbclient.la \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@
++LDADD +=	\
++		$(top_builddir)/storage/ndb/src/libndbclient.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ \
++		$(ZLIB_LIBS)
+ 
+-INCLUDES += -I$(srcdir) \
+-	-I$(top_builddir)/include \
+-	-I$(top_builddir)/storage/ndb/include \
+-	-I$(top_srcdir)/include \
+-	-I$(top_srcdir)/storage/ndb/include \
+-        -I$(top_srcdir)/storage/ndb/include/ndbapi \
+-        -I$(top_srcdir)/storage/ndb/include/util \
+-        -I$(top_srcdir)/storage/ndb/include/portlib \
+-        -I$(top_srcdir)/storage/ndb/test/include \
+-        -I$(top_srcdir)/storage/ndb/include/mgmapi \
+-        -I$(top_srcdir)/storage/ndb/include/kernel
++INCLUDES +=	-I$(srcdir) \
++		-I$(top_builddir)/include \
++		-I$(top_builddir)/storage/ndb/include \
++		-I$(top_srcdir)/include \
++		-I$(top_srcdir)/storage/ndb/include \
++		-I$(top_srcdir)/storage/ndb/include/ndbapi \
++		-I$(top_srcdir)/storage/ndb/include/util \
++		-I$(top_srcdir)/storage/ndb/include/portlib \
++		-I$(top_srcdir)/storage/ndb/test/include \
++		-I$(top_srcdir)/storage/ndb/include/mgmapi \
++		-I$(top_srcdir)/storage/ndb/include/kernel
+Index: storage/ndb/config/win-libraries
+===================================================================
+--- storage/ndb/config/win-libraries.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/config/win-libraries	2010-11-27 15:02:49.000000000 +0100
+@@ -21,7 +21,7 @@ do
+ # the same goes for mysys and strings
+   lib=$i
+   case $i in
+-  *libdbug.a | *libmysys.a | *libmystrings.a) 
++  *libdbug.la | *libmysys.la | *libmystrings.la) 
+   lib=`echo $i | sed s'!dbug\/lib!!' | sed 's!mysys\/lib!!' | sed 's!strings\/libmy!!'`
+   echo "Changing from $i to $lib"
+   ;;
+Index: storage/ndb/src/cw/cpcd/Makefile.am
+===================================================================
+--- storage/ndb/src/cw/cpcd/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/cw/cpcd/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -19,9 +19,9 @@ ndb_cpcd_SOURCES = main.cpp CPCD.cpp Pro
+ 
+ LDADD_LOC = \
+             $(top_builddir)/storage/ndb/src/libndbclient.la      \
+-            $(top_builddir)/dbug/libdbug.a \
+-            $(top_builddir)/mysys/libmysys.a \
+-            $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
++            $(top_builddir)/dbug/libdbug.la \
++            $(top_builddir)/mysys/libmysys.la \
++            $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
+ 
+ include $(top_srcdir)/storage/ndb/config/common.mk.am
+ include $(top_srcdir)/storage/ndb/config/type_util.mk.am
+Index: storage/ndb/src/kernel/Makefile.am
+===================================================================
+--- storage/ndb/src/kernel/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/kernel/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -53,9 +53,10 @@ LDADD +=  \
+               $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
+               $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la      \
+               $(top_builddir)/storage/ndb/src/common/util/libgeneral.la  \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ \
++		$(ZLIB_LIBS)
+ 
+ windoze-dsp: ndbd.dsp
+ 
+Index: storage/ndb/src/kernel/blocks/Makefile.am
+===================================================================
+--- storage/ndb/src/kernel/blocks/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/kernel/blocks/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -18,7 +18,7 @@ SUBDIRS = \
+ 	dbdih		\
+ 	dblqh		\
+ 	dbtup		\
+-        backup          
++	backup          
+ 
+ noinst_LIBRARIES = libblocks.a
+ 
+@@ -56,10 +56,10 @@ libblocks_a_SOURCES = tsman.cpp lgman.cp
+ EXTRA_PROGRAMS = ndb_print_file
+ ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp
+ ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
+-  $(top_builddir)/storage/ndb/src/libndbclient.la \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a
++		$(top_builddir)/storage/ndb/src/libndbclient.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/strings/libmystrings.la
+ 
+ include $(top_srcdir)/storage/ndb/config/common.mk.am
+ include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+Index: storage/ndb/src/kernel/blocks/backup/Makefile.am
+===================================================================
+--- storage/ndb/src/kernel/blocks/backup/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/kernel/blocks/backup/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_backup_fil
+ ndb_print_backup_file_SOURCES = read.cpp
+ ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
+   $(top_builddir)/storage/ndb/src/libndbclient.la \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/strings/libmystrings.a
++         $(top_builddir)/mysys/libmysys.la \
++         $(top_builddir)/dbug/libdbug.la \
++         $(top_builddir)/strings/libmystrings.la
+ 
+ include $(top_srcdir)/storage/ndb/config/common.mk.am
+ include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+Index: storage/ndb/src/kernel/blocks/dbdict/Makefile.am
+===================================================================
+--- storage/ndb/src/kernel/blocks/dbdict/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -19,17 +19,17 @@ include $(top_srcdir)/storage/ndb/config
+ LDADD +=  \
+          $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
+          $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a
++         $(top_builddir)/dbug/libdbug.la \
++         $(top_builddir)/mysys/libmysys.la \
++         $(top_builddir)/strings/libmystrings.la
+ 
+ ndbtools_PROGRAMS = ndb_print_schema_file
+ ndb_print_schema_file_SOURCES = printSchemaFile.cpp
+ ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \
+   $(top_builddir)/storage/ndb/src/libndbclient.la \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a
++         $(top_builddir)/dbug/libdbug.la \
++         $(top_builddir)/mysys/libmysys.la \
++         $(top_builddir)/strings/libmystrings.la
+ 
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+Index: storage/ndb/src/kernel/blocks/dbdih/Makefile.am
+===================================================================
+--- storage/ndb/src/kernel/blocks/dbdih/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_sys_file
+ ndb_print_sys_file_SOURCES = printSysfile.cpp
+ ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
+   $(top_builddir)/storage/ndb/src/libndbclient.la \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a
++         $(top_builddir)/dbug/libdbug.la \
++         $(top_builddir)/mysys/libmysys.la \
++         $(top_builddir)/strings/libmystrings.la
+ 
+ 
+ include $(top_srcdir)/storage/ndb/config/common.mk.am
+Index: storage/ndb/src/kernel/blocks/dblqh/Makefile.am
+===================================================================
+--- storage/ndb/src/kernel/blocks/dblqh/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -23,9 +23,9 @@ include $(top_srcdir)/storage/ndb/config
+ 
+ ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \
+   $(top_builddir)/storage/ndb/src/libndbclient.la \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a
++         $(top_builddir)/dbug/libdbug.la \
++         $(top_builddir)/mysys/libmysys.la \
++         $(top_builddir)/strings/libmystrings.la
+ 
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+Index: storage/ndb/src/kernel/blocks/dbtup/Makefile.am
+===================================================================
+--- storage/ndb/src/kernel/blocks/dbtup/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -20,9 +20,9 @@ EXTRA_PROGRAMS = test_varpage
+ test_varpage_SOURCES = test_varpage.cpp tuppage.cpp
+ test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
+   $(top_builddir)/storage/ndb/src/libndbclient.la \
+-  $(top_builddir)/mysys/libmysys.a \
+-  $(top_builddir)/dbug/libdbug.a \
+-  $(top_builddir)/strings/libmystrings.a
++  $(top_builddir)/mysys/libmysys.la \
++  $(top_builddir)/dbug/libdbug.la \
++  $(top_builddir)/strings/libmystrings.la
+ 
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+Index: storage/ndb/src/kernel/vm/Makefile.am
+===================================================================
+--- storage/ndb/src/kernel/vm/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/kernel/vm/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -21,22 +21,22 @@
+ noinst_LIBRARIES = libkernel.a
+ 
+ libkernel_a_SOURCES = \
+-	SimulatedBlock.cpp	\
+-	FastScheduler.cpp		\
+-	TimeQueue.cpp		\
+-	VMSignal.cpp		\
+-	ThreadConfig.cpp          \
+-	TransporterCallback.cpp \
+-	Emulator.cpp		\
+-	Configuration.cpp		\
+-	WatchDog.cpp \
+-        SimplePropertiesSection.cpp \
+-        SectionReader.cpp \
+-        Mutex.cpp SafeCounter.cpp \
+-        Rope.cpp \
+-	ndbd_malloc.cpp ndbd_malloc_impl.cpp \
+-        Pool.cpp WOPool.cpp RWPool.cpp \
+-        DynArr256.cpp
++		SimulatedBlock.cpp \
++		FastScheduler.cpp \
++		TimeQueue.cpp \
++		VMSignal.cpp \
++		ThreadConfig.cpp \
++		TransporterCallback.cpp \
++		Emulator.cpp \
++		Configuration.cpp \
++		WatchDog.cpp \
++		SimplePropertiesSection.cpp \
++		SectionReader.cpp \
++		Mutex.cpp SafeCounter.cpp \
++		Rope.cpp \
++		ndbd_malloc.cpp ndbd_malloc_impl.cpp \
++		Pool.cpp WOPool.cpp RWPool.cpp \
++		DynArr256.cpp
+ 
+ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
+ 
+@@ -49,40 +49,40 @@ include $(top_srcdir)/storage/ndb/config
+ windoze-dsp: libkernel.dsp
+ 
+ libkernel.dsp: Makefile \
+-               $(top_srcdir)/storage/ndb/config/win-lib.am \
+-               $(top_srcdir)/storage/ndb/config/win-name \
+-               $(top_srcdir)/storage/ndb/config/win-includes \
+-               $(top_srcdir)/storage/ndb/config/win-sources \
+-               $(top_srcdir)/storage/ndb/config/win-libraries
+-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
+-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
++		$(top_srcdir)/storage/ndb/config/win-lib.am \
++		$(top_srcdir)/storage/ndb/config/win-name \
++		$(top_srcdir)/storage/ndb/config/win-includes \
++		$(top_srcdir)/storage/ndb/config/win-sources \
++		$(top_srcdir)/storage/ndb/config/win-libraries
++		cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
++		@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
++		@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
++		@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
++		@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
+ 
+ EXTRA_PROGRAMS = ndbd_malloc_impl_test bench_pool testDynArr256
+ ndbd_malloc_impl_test_CXXFLAGS = -DUNIT_TEST
+ ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp
+ ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \
+-  $(top_builddir)/storage/ndb/src/libndbclient.la \
+-  $(top_builddir)/mysys/libmysys.a \
+-  $(top_builddir)/dbug/libdbug.a \
+-  $(top_builddir)/strings/libmystrings.a
++		$(top_builddir)/storage/ndb/src/libndbclient.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/strings/libmystrings.la
+ 
+ bench_pool_SOURCES = bench_pool.cpp
+-bench_pool_LDFLAGS = @ndb_bin_am_ldflags@\
+-  libkernel.a ../error/liberror.a \
+-  $(top_builddir)/storage/ndb/src/libndbclient.la \
+-  $(top_builddir)/mysys/libmysys.a \
+-  $(top_builddir)/dbug/libdbug.a \
+-  $(top_builddir)/strings/libmystrings.a
++bench_pool_LDFLAGS = @ndb_bin_am_ldflags@ \
++		libkernel.a ../error/liberror.a \
++		$(top_builddir)/storage/ndb/src/libndbclient.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/strings/libmystrings.la
+ 
+ testDynArr256_CXXFLAGS = -DUNIT_TEST
+ testDynArr256_SOURCES = DynArr256.cpp
+ testDynArr256_LDFLAGS = @ndb_bin_am_ldflags@ \
+-  libkernel.a ../error/liberror.a \
+-  $(top_builddir)/storage/ndb/src/libndbclient.la \
+-  $(top_builddir)/mysys/libmysys.a \
+-  $(top_builddir)/dbug/libdbug.a \
+-  $(top_builddir)/strings/libmystrings.a
++		libkernel.a ../error/liberror.a \
++		$(top_builddir)/storage/ndb/src/libndbclient.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/strings/libmystrings.la
+ 
+Index: storage/ndb/src/mgmclient/Makefile.am
+===================================================================
+--- storage/ndb/src/mgmclient/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/mgmclient/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -18,12 +18,11 @@ ndbtools_PROGRAMS = ndb_mgm
+ 
+ libndbmgmclient_la_SOURCES = CommandInterpreter.cpp
+ libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \
+-			    ../common/logger/liblogger.la \
+-			    ../common/portlib/libportlib.la \
+-			    ../common/util/libgeneral.la \
+-			    ../common/portlib/libportlib.la \
+-			    ../common/debugger/libtrace.la
+-
++		../common/logger/liblogger.la \
++		../common/portlib/libportlib.la \
++		../common/util/libgeneral.la \
++		../common/portlib/libportlib.la \
++		../common/debugger/libtrace.la
+ 
+ ndb_mgm_SOURCES = main.cpp
+ 
+@@ -34,13 +33,13 @@ INCLUDES += -I$(top_srcdir)/storage/ndb/
+             -I$(top_srcdir)/storage/ndb/src/common/mgmcommon
+ 
+ LDADD_LOC = $(noinst_LTLIBRARIES) \
+-	    ../common/portlib/libportlib.la \
+-            @readline_link@ \
+-            $(top_builddir)/storage/ndb/src/libndbclient.la \
+-            $(top_builddir)/dbug/libdbug.a \
+-            $(top_builddir)/mysys/libmysys.a \
+-            $(top_builddir)/strings/libmystrings.a \
+-            @TERMCAP_LIB@ @NDB_SCI_LIBS@
++		../common/portlib/libportlib.la \
++		@readline_link@ \
++		$(top_builddir)/storage/ndb/src/libndbclient.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/strings/libmystrings.la \
++		@TERMCAP_LIB@ @NDB_SCI_LIBS@
+ 
+ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
+ 
+@@ -50,25 +49,25 @@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
+ windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
+ 
+ ndb_mgm.dsp: Makefile \
+-               $(top_srcdir)/storage/ndb/config/win-prg.am \
+-               $(top_srcdir)/storage/ndb/config/win-name \
+-               $(top_srcdir)/storage/ndb/config/win-includes \
+-               $(top_srcdir)/storage/ndb/config/win-sources \
+-               $(top_srcdir)/storage/ndb/config/win-libraries
+-	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
+-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
+-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
++		$(top_srcdir)/storage/ndb/config/win-prg.am \
++		$(top_srcdir)/storage/ndb/config/win-name \
++		$(top_srcdir)/storage/ndb/config/win-includes \
++		$(top_srcdir)/storage/ndb/config/win-sources \
++		$(top_srcdir)/storage/ndb/config/win-libraries
++		cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
++		@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
++		@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
++		@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
++		@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+ 
+ libndbmgmclient.dsp: Makefile \
+-               $(top_srcdir)/storage/ndb/config/win-lib.am \
+-               $(top_srcdir)/storage/ndb/config/win-name \
+-               $(top_srcdir)/storage/ndb/config/win-includes \
+-               $(top_srcdir)/storage/ndb/config/win-sources \
+-               $(top_srcdir)/storage/ndb/config/win-libraries
+-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
+-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB
++		$(top_srcdir)/storage/ndb/config/win-lib.am \
++		$(top_srcdir)/storage/ndb/config/win-name \
++		$(top_srcdir)/storage/ndb/config/win-includes \
++		$(top_srcdir)/storage/ndb/config/win-sources \
++		$(top_srcdir)/storage/ndb/config/win-libraries
++		cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
++		@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
++		@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
++		@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
++		@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB
+Index: storage/ndb/src/mgmsrv/Makefile.am
+===================================================================
+--- storage/ndb/src/mgmsrv/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/mgmsrv/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -22,35 +22,35 @@ MYSQLCLUSTERdir=        .
+ ndbbin_PROGRAMS = ndb_mgmd
+ 
+ ndb_mgmd_SOURCES = \
+-	MgmtSrvr.cpp \
+-	MgmtSrvrGeneralSignalHandling.cpp \
+-	main.cpp \
+-	Services.cpp \
+-	convertStrToInt.cpp \
+-	SignalQueue.cpp \
+-	MgmtSrvrConfig.cpp \
+-	ConfigInfo.cpp \
+-	InitConfigFileParser.cpp \
+-	Config.cpp
++		MgmtSrvr.cpp \
++		MgmtSrvrGeneralSignalHandling.cpp \
++		main.cpp \
++		Services.cpp \
++		convertStrToInt.cpp \
++		SignalQueue.cpp \
++		MgmtSrvrConfig.cpp \
++		ConfigInfo.cpp \
++		InitConfigFileParser.cpp \
++		Config.cpp
+ 
+ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/ndbapi \
+-               -I$(top_srcdir)/storage/ndb/src/mgmapi \
+-               -I$(top_srcdir)/storage/ndb/src/common/mgmcommon \
+-               -I$(top_srcdir)/storage/ndb/src/mgmclient
++		-I$(top_srcdir)/storage/ndb/src/mgmapi \
++		-I$(top_srcdir)/storage/ndb/src/common/mgmcommon \
++		-I$(top_srcdir)/storage/ndb/src/mgmclient
+ 
+ LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \
+-            $(top_builddir)/storage/ndb/src/libndbclient.la \
+-            $(top_builddir)/dbug/libdbug.a \
+-            $(top_builddir)/mysys/libmysys.a \
+-            $(top_builddir)/strings/libmystrings.a \
+-            @readline_link@ \
+-            @NDB_SCI_LIBS@ \
+-	    @TERMCAP_LIB@
+-
+-DEFS_LOC =		-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
+-			-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
+-			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+-			-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
++		$(top_builddir)/storage/ndb/src/libndbclient.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/strings/libmystrings.la \
++		@readline_link@ \
++		@NDB_SCI_LIBS@ \
++		@TERMCAP_LIB@
++
++DEFS_LOC =	-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
++		-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
++		-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
++		-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
+ 
+ include $(top_srcdir)/storage/ndb/config/common.mk.am
+ include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
+@@ -63,13 +63,13 @@ ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
+ windoze-dsp: ndb_mgmd.dsp
+ 
+ ndb_mgmd.dsp: Makefile \
+-               $(top_srcdir)/storage/ndb/config/win-prg.am \
+-               $(top_srcdir)/storage/ndb/config/win-name \
+-               $(top_srcdir)/storage/ndb/config/win-includes \
+-               $(top_srcdir)/storage/ndb/config/win-sources \
+-               $(top_srcdir)/storage/ndb/config/win-libraries
+-	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
+-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
+-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
++		$(top_srcdir)/storage/ndb/config/win-prg.am \
++		$(top_srcdir)/storage/ndb/config/win-name \
++		$(top_srcdir)/storage/ndb/config/win-includes \
++		$(top_srcdir)/storage/ndb/config/win-sources \
++		$(top_srcdir)/storage/ndb/config/win-libraries
++		cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
++		@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
++		@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
++		@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
++		@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+Index: storage/ndb/src/ndbapi/Makefile.am
+===================================================================
+--- storage/ndb/src/ndbapi/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/src/ndbapi/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -22,41 +22,42 @@ ndberror_check_SOURCES = ndberror_check.
+ noinst_LTLIBRARIES = libndbapi.la
+ 
+ libndbapi_la_SOURCES = \
+-        TransporterFacade.cpp   \
+-        ClusterMgr.cpp  \
+-        Ndb.cpp \
+-        NdbPoolImpl.cpp \
+-        NdbPool.cpp \
+-        Ndblist.cpp     \
+-        Ndbif.cpp       \
+-        Ndbinit.cpp     \
+-        Ndberr.cpp    \
+-        ndberror.c    \
+-        NdbErrorOut.cpp    \
+-        NdbTransaction.cpp       \
+-        NdbTransactionScan.cpp \
+-        NdbOperation.cpp        \
+-        NdbOperationSearch.cpp  \
+-        NdbOperationScan.cpp    \
+-        NdbOperationInt.cpp     \
+-        NdbOperationDefine.cpp  \
+-        NdbOperationExec.cpp    \
+-        NdbScanOperation.cpp    NdbScanFilter.cpp \
+-        NdbIndexOperation.cpp   \
+-        NdbEventOperation.cpp   \
+-        NdbEventOperationImpl.cpp   \
+-        NdbApiSignal.cpp        \
+-        NdbRecAttr.cpp  \
+-        NdbUtil.cpp \
+-        NdbReceiver.cpp \
+-        NdbDictionary.cpp \
+-        NdbDictionaryImpl.cpp \
+-        DictCache.cpp \
+-        ndb_cluster_connection.cpp \
+-	NdbBlob.cpp \
+-	NdbIndexStat.cpp \
+-        SignalSender.cpp \
+-        ObjectMap.cpp
++		TransporterFacade.cpp \
++		ClusterMgr.cpp \
++		Ndb.cpp \
++		NdbPoolImpl.cpp \
++		NdbPool.cpp \
++		Ndblist.cpp \
++		Ndbif.cpp \
++		Ndbinit.cpp \
++		Ndberr.cpp \
++		ndberror.c \
++		NdbErrorOut.cpp \
++		NdbTransaction.cpp \
++		NdbTransactionScan.cpp \
++		NdbOperation.cpp \
++		NdbOperationSearch.cpp \
++		NdbOperationScan.cpp \
++		NdbOperationInt.cpp \
++		NdbOperationDefine.cpp \
++		NdbOperationExec.cpp \
++		NdbScanOperation.cpp \
++		NdbScanFilter.cpp \
++		NdbIndexOperation.cpp \
++		NdbEventOperation.cpp \
++		NdbEventOperationImpl.cpp \
++		NdbApiSignal.cpp \
++		NdbRecAttr.cpp \
++		NdbUtil.cpp \
++		NdbReceiver.cpp \
++		NdbDictionary.cpp \
++		NdbDictionaryImpl.cpp \
++		DictCache.cpp \
++		ndb_cluster_connection.cpp \
++		NdbBlob.cpp \
++		NdbIndexStat.cpp \
++		SignalSender.cpp \
++		ObjectMap.cpp
+ 
+ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
+ 
+@@ -67,9 +68,10 @@ include $(top_srcdir)/storage/ndb/config
+ include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
+ 
+ ndberror_check_LDFLAGS = \
+-         $(top_builddir)/dbug/libdbug.a \
+-         $(top_builddir)/mysys/libmysys.a \
+-         $(top_builddir)/strings/libmystrings.a
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/strings/libmystrings.la \
++		$(ZLIB_LIBS)
+ 
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+@@ -77,13 +79,13 @@ ndberror_check_LDFLAGS = \
+ windoze-dsp: libndbapi.dsp
+ 
+ libndbapi.dsp: Makefile \
+-               $(top_srcdir)/storage/ndb/config/win-lib.am \
+-               $(top_srcdir)/storage/ndb/config/win-name \
+-               $(top_srcdir)/storage/ndb/config/win-includes \
+-               $(top_srcdir)/storage/ndb/config/win-sources \
+-               $(top_srcdir)/storage/ndb/config/win-libraries
+-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbapi_la_SOURCES)
+-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
++		$(top_srcdir)/storage/ndb/config/win-lib.am \
++		$(top_srcdir)/storage/ndb/config/win-name \
++		$(top_srcdir)/storage/ndb/config/win-includes \
++		$(top_srcdir)/storage/ndb/config/win-sources \
++		$(top_srcdir)/storage/ndb/config/win-libraries
++		cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
++		@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
++		@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
++		@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbapi_la_SOURCES)
++		@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
+Index: storage/ndb/test/run-test/Makefile.am
+===================================================================
+--- storage/ndb/test/run-test/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ storage/ndb/test/run-test/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -34,9 +34,9 @@ atrt_SOURCES = main.cpp setup.cpp files.
+ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include
+ LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \
+ 	    $(top_builddir)/storage/ndb/src/libndbclient.la \
+-            $(top_builddir)/dbug/libdbug.a \
+-            $(top_builddir)/mysys/libmysys.a \
+-            $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
++            $(top_builddir)/dbug/libdbug.la \
++            $(top_builddir)/mysys/libmysys.la \
++            $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
+ 
+ atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \
+                       -I$(top_srcdir)/ndb/src/mgmsrv \
+Index: strings/Makefile.am
+===================================================================
+--- strings/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ strings/Makefile.am	2010-11-27 19:42:38.000000000 +0100
+@@ -16,7 +16,7 @@
+ # This file is public domain and comes with NO WARRANTY of any kind
+ 
+ INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
+-pkglib_LIBRARIES =	libmystrings.a
++noinst_LTLIBRARIES =	libmystrings.la
+ 
+ # Exact one of ASSEMBLER_X
+ if ASSEMBLER_x86
+@@ -37,7 +37,7 @@ CSRCS		= strxmov.c bmove_upp.c strappend
+ endif
+ endif
+ 
+-libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
++libmystrings_la_SOURCES = $(ASRCS) $(CSRCS)
+ noinst_PROGRAMS = conf_to_src
+ CLEANFILES = str_test uctypedump test_decimal
+ # Default charset definitions
+@@ -56,9 +56,9 @@ EXTRA_DIST =		ctype-big5.c ctype-cp932.c
+ 			t_ctype.h my_strchr.c CMakeLists.txt \
+ 			CHARSET_INFO.txt
+ 
+-libmystrings_a_LIBADD=
+-conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c
+-conf_to_src_LDADD=
++libmystrings_la_LIBADD=
++conf_to_src_SOURCES = conf_to_src.c
++conf_to_src_LDADD =	libmystrings.la
+ #force static linking of conf_to_src - essential when linking against
+ #custom installation of libc
+ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
+@@ -69,15 +69,15 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
+ 
+ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
+ 
+-str_test: str_test.c $(pkglib_LIBRARIES)
+-	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES)
++str_test: str_test.c $(pkglib_LTLIBRARIES)
++	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LTLIBRARIES)
+ 
+ uctypedump: uctypedump.c
+ 	$(LINK) $(INCLUDES) $(srcdir)/uctypedump.c
+ 
+ test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES)
+ 	$(CP) $(srcdir)/decimal.c ./test_decimal.c
+-	$(LINK) $(FLAGS) -DMAIN  ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES)
++	$(LINK) $(FLAGS) -DMAIN  ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIES)
+ 	$(RM) -f ./test_decimal.c
+ 
+ # Don't update the files from bitkeeper
+Index: unittest/unit.pl
+===================================================================
+--- unittest/unit.pl.orig	2010-11-27 15:02:45.000000000 +0100
++++ unittest/unit.pl	2010-11-27 15:02:49.000000000 +0100
+@@ -55,7 +55,7 @@ sub _find_test_files (@) {
+     my @dirs = @_;
+     my @files;
+     find sub { 
+-        $File::Find::prune = 1 if /^SCCS$/;
++        $File::Find::prune = 1 if /^(SCCS|\.libs)$/;
+         push(@files, $File::Find::name) if -x _ && /-t\z/;
+     }, @dirs;
+     return @files;
+Index: unittest/mysys/Makefile.am
+===================================================================
+--- unittest/mysys/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ unittest/mysys/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -13,15 +13,16 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+-AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include 
+-AM_CPPFLAGS     += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
++AM_CPPFLAGS =	@ZLIB_INCLUDES@ -I$(top_builddir)/include 
++AM_CPPFLAGS +=	-I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
+ 
+-LDADD 		= $(top_builddir)/unittest/mytap/libmytap.a \
+-		  $(top_builddir)/mysys/libmysys.a \
+-		  $(top_builddir)/dbug/libdbug.a \
+-		  $(top_builddir)/strings/libmystrings.a
++LDADD =	$(top_builddir)/unittest/mytap/libmytap.a \
++		$(top_builddir)/mysys/libmysys.la \
++		$(top_builddir)/dbug/libdbug.la \
++		$(top_builddir)/strings/libmystrings.la \
++		$(ZLIB_LIBS)
+ 
+-noinst_PROGRAMS  = bitmap-t base64-t
++noinst_PROGRAMS =	bitmap-t base64-t
+ 
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+Index: unittest/strings/Makefile.am
+===================================================================
+--- unittest/strings/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ unittest/strings/Makefile.am	2010-11-27 15:02:49.000000000 +0100
+@@ -16,10 +16,11 @@
+ AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include 
+ AM_CPPFLAGS     += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
+ 
+-LDADD 		= $(top_builddir)/unittest/mytap/libmytap.a \
+-		  $(top_builddir)/mysys/libmysys.a \
+-		  $(top_builddir)/dbug/libdbug.a \
+-		  $(top_builddir)/strings/libmystrings.a
++LDADD		= $(top_builddir)/unittest/mytap/libmytap.a \
++			$(top_builddir)/mysys/libmysys.la \
++			$(top_builddir)/dbug/libdbug.la \
++			$(top_builddir)/strings/libmystrings.la \
++			$(ZLIB_LIBS)
+ 
+ noinst_PROGRAMS  = strings-t
+ 
+Index: vio/Makefile.am
+===================================================================
+--- vio/Makefile.am.orig	2010-11-27 15:02:45.000000000 +0100
++++ vio/Makefile.am	2010-11-27 19:43:02.000000000 +0100
+@@ -16,11 +16,11 @@
+ INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
+ 			$(openssl_includes)
+ LDADD =			@CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
+-pkglib_LIBRARIES =	libvio.a
++noinst_LTLIBRARIES =	libvio.la
+ 
+ noinst_HEADERS =	vio_priv.h
+ 
+-libvio_a_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
++libvio_la_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
+ 
+ EXTRA_DIST=		CMakeLists.txt
+