diff options
| author |   Robin H. Johnson <robbat2@orbis-terrarum.net> | 2009-04-11 16:38:52 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@orbis-terrarum.net> | 2009-04-11 16:38:52 -0700 |
| commit | 008353e11046816f6783ebcd6d3f276fa3e4ea83 (patch) | |
| tree | a587801c65f2c89b22329eb4d414b973e8d8a64d | |
| parent | Missing LDADD. (diff) | |
| download | mysql-extras-008353e11046816f6783ebcd6d3f276fa3e4ea83.tar.gz mysql-extras-008353e11046816f6783ebcd6d3f276fa3e4ea83.tar.bz2 mysql-extras-008353e11046816f6783ebcd6d3f276fa3e4ea83.zip | |
NDB missed some patches.mysql-extras-20090411-2338Z
| -rw-r--r-- | 0204_all_embedded-library-shared.5.0.76.patch | 112 |
1 files changed, 112 insertions, 0 deletions
diff --git a/0204_all_embedded-library-shared.5.0.76.patch b/0204_all_embedded-library-shared.5.0.76.patch index cadf66b..fbfa38e 100644 --- a/0204_all_embedded-library-shared.5.0.76.patch +++ b/0204_all_embedded-library-shared.5.0.76.patch @@ -1380,3 +1380,115 @@ diff -ur mysql-5.0.76-old/vio/Makefile.am mysql-5.0.76/vio/Makefile.am EXTRA_DIST= CMakeLists.txt +diff -Nuar mysql.orig/ndb/src/common/util/Makefile.am mysql/ndb/src/common/util/Makefile.am +--- mysql.orig/ndb/src/common/util/Makefile.am 2009-04-11 16:31:18.000000000 -0700 ++++ mysql/ndb/src/common/util/Makefile.am 2009-04-11 16:36:38.520666040 -0700 +@@ -31,9 +31,9 @@ + testBitmask_SOURCES = testBitmask.cpp + testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \ + $(top_builddir)/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 +diff -Nuar mysql.orig/ndb/src/cw/cpcd/Makefile.am mysql/ndb/src/cw/cpcd/Makefile.am +--- mysql.orig/ndb/src/cw/cpcd/Makefile.am 2009-04-11 16:31:18.000000000 -0700 ++++ mysql/ndb/src/cw/cpcd/Makefile.am 2009-04-11 16:36:32.185153480 -0700 +@@ -19,9 +19,9 @@ + + LDADD_LOC = \ + $(top_builddir)/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)/ndb/config/common.mk.am + include $(top_srcdir)/ndb/config/type_util.mk.am +diff -Nuar mysql.orig/ndb/src/kernel/blocks/dbdict/Makefile.am mysql/ndb/src/kernel/blocks/dbdict/Makefile.am +--- mysql.orig/ndb/src/kernel/blocks/dbdict/Makefile.am 2009-04-11 16:31:18.000000000 -0700 ++++ mysql/ndb/src/kernel/blocks/dbdict/Makefile.am 2009-04-11 16:37:40.586744073 -0700 +@@ -26,9 +26,9 @@ + LDADD += \ + $(top_builddir)/ndb/src/common/util/libgeneral.la \ + $(top_builddir)/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 + + # Don't update the files from bitkeeper + %::SCCS/s.% +diff -Nuar mysql.orig/ndb/src/kernel/Makefile.am mysql/ndb/src/kernel/Makefile.am +--- mysql.orig/ndb/src/kernel/Makefile.am 2009-04-11 16:31:18.000000000 -0700 ++++ mysql/ndb/src/kernel/Makefile.am 2009-04-11 16:37:20.953412135 -0700 +@@ -66,9 +66,9 @@ + $(top_builddir)/ndb/src/mgmapi/libmgmapi.la \ + $(top_builddir)/ndb/src/common/portlib/libportlib.la \ + $(top_builddir)/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@ + + # Don't update the files from bitkeeper + %::SCCS/s.% +diff -Nuar mysql.orig/ndb/src/mgmclient/Makefile.am mysql/ndb/src/mgmclient/Makefile.am +--- mysql.orig/ndb/src/mgmclient/Makefile.am 2009-04-11 16:31:18.000000000 -0700 ++++ mysql/ndb/src/mgmclient/Makefile.am 2009-04-11 16:36:16.280363648 -0700 +@@ -37,9 +37,9 @@ + ../common/portlib/libportlib.la \ + @readline_link@ \ + $(top_builddir)/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 \ + @TERMCAP_LIB@ @NDB_SCI_LIBS@ + + ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ +diff -Nuar mysql.orig/ndb/src/mgmsrv/Makefile.am mysql/ndb/src/mgmsrv/Makefile.am +--- mysql.orig/ndb/src/mgmsrv/Makefile.am 2009-04-11 16:31:18.000000000 -0700 ++++ mysql/ndb/src/mgmsrv/Makefile.am 2009-04-11 16:36:22.920358437 -0700 +@@ -40,9 +40,9 @@ + + LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CommandInterpreter.lo \ + $(top_builddir)/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 \ + @readline_link@ \ + @NDB_SCI_LIBS@ \ + @TERMCAP_LIB@ +diff -Nuar mysql.orig/ndb/test/run-test/Makefile.am mysql/ndb/test/run-test/Makefile.am +--- mysql.orig/ndb/test/run-test/Makefile.am 2009-04-11 16:31:18.000000000 -0700 ++++ mysql/ndb/test/run-test/Makefile.am 2009-04-11 16:36:07.367509286 -0700 +@@ -32,9 +32,9 @@ + INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include + LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \ + $(top_builddir)/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@ + + wrappersdir=$(prefix)/bin + wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run |