[Commits] Rev 2926: Small fixes for libmysqld.so for ndb and unit tests. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Sep 27 14:28:41 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 2926
revision-id: knielsen at knielsen-hq.org-20100927112840-atpt179jikrkvcxj
parent: knielsen at knielsen-hq.org-20100916124935-fygwfnrla9ci13aj
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-mwl74
timestamp: Mon 2010-09-27 13:28:40 +0200
message:
  Small fixes for libmysqld.so for ndb and unit tests.
=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/libmysqld/Makefile.am	2010-09-27 11:28:40 +0000
@@ -34,7 +34,8 @@ INCLUDES=		-I$(top_builddir)/include -I$
                         -I$(top_srcdir)/sql/examples \
                         -I$(top_srcdir)/regex \
                         $(openssl_includes) @ZLIB_INCLUDES@ \
-                        @condition_dependent_plugin_includes@
+                        @condition_dependent_plugin_includes@ \
+                        @ndbcluster_includes@
 
 pkglib_LTLIBRARIES =    libmysqld.la
 SUBDIRS =               . examples
@@ -87,7 +88,7 @@ INC_LIB=	$(top_builddir)/regex/libregex.
                 $(top_builddir)/strings/libmystrings.la \
                 $(top_builddir)/dbug/libdbug.la \
                 $(top_builddir)/vio/libvio.la \
-                @NDB_SCI_LIBS@ \
+                @ndbcluster_libs@ @NDB_SCI_LIBS@ \
                 @mysql_embedded_plugin_libs@ \
                 $(libevent_inc_libs) \
                 $(yassl_inc_libs)
@@ -101,39 +102,6 @@ libmysqld_la_SOURCES= $(libmysqld_source
 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 $<
-
-ha_ndbcluster_cond.o:ha_ndbcluster_cond.cc
-                $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
-ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc
-                $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
-# Until we can remove dependency on ha_ndbcluster.h
-handler.o:      handler.cc
-                $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
-# We need rules to compile these as no good way
-# found to append fileslists that collected by configure
-# to the sources list
-
-ha_federatedx.o:ha_federatedx.cc
-                $(CXXCOMPILE) $(LM_CFLAGS) -c $<
-
-ha_heap.o:ha_heap.cc
-                $(CXXCOMPILE) $(LM_CFLAGS) -c $<
-
-ha_innodb.o:ha_innodb.cc
-                $(CXXCOMPILE) $(LM_CFLAGS) -c $<
-
-ha_myisam.o:ha_myisam.cc
-                $(CXXCOMPILE) $(LM_CFLAGS) -c $<
-
-ha_myisammrg.o:ha_myisammrg.cc
-                $(CXXCOMPILE) $(LM_CFLAGS) -c $<
-
 ## 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

=== modified file 'libmysqld/examples/Makefile.am'
--- a/libmysqld/examples/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/libmysqld/examples/Makefile.am	2010-09-27 11:28:40 +0000
@@ -38,7 +38,7 @@ INCLUDES =	-I$(top_builddir)/include -I$
                 $(openssl_includes)
 LIBS =          @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
 LDADD =         @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @LIBDL@ $(CXXLDFLAGS) \
-                @NDB_SCI_LIBS@ \
+                @ndbcluster_libs@ @NDB_SCI_LIBS@ \
                 $(top_builddir)/mysys/libmysys.la \
                 $(top_builddir)/strings/libmystrings.la \
                 $(top_builddir)/dbug/libdbug.la \

=== modified file 'storage/ndb/config/type_ndbapitest.mk.am'
--- a/storage/ndb/config/type_ndbapitest.mk.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/config/type_ndbapitest.mk.am	2010-09-27 11:28:40 +0000
@@ -15,9 +15,10 @@
 
 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@
+         $(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 \

=== modified file 'storage/ndb/config/type_ndbapitools.mk.am'
--- a/storage/ndb/config/type_ndbapitools.mk.am	2006-12-31 00:32:21 +0000
+++ b/storage/ndb/config/type_ndbapitools.mk.am	2010-09-27 11:28:40 +0000
@@ -15,9 +15,9 @@
 
 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@
+         $(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 \

=== modified file 'storage/ndb/config/win-libraries'
--- a/storage/ndb/config/win-libraries	2005-04-27 01:19:54 +0000
+++ b/storage/ndb/config/win-libraries	2010-09-27 11:28:40 +0000
@@ -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"
   ;;

=== modified file 'storage/ndb/src/kernel/Makefile.am'
--- a/storage/ndb/src/kernel/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/kernel/Makefile.am	2010-09-27 11:28:40 +0000
@@ -55,7 +55,7 @@ LDADD +=  \
               $(top_builddir)/storage/ndb/src/common/util/libgeneral.la  \
          $(top_builddir)/dbug/libdbug.la \
          $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
+         $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ $(ZLIB_LIBS)
 
 windoze-dsp: ndbd.dsp
 

=== modified file 'storage/ndb/src/ndbapi/Makefile.am'
--- a/storage/ndb/src/ndbapi/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/ndbapi/Makefile.am	2010-09-27 11:28:40 +0000
@@ -69,7 +69,8 @@ include $(top_srcdir)/storage/ndb/config
 ndberror_check_LDFLAGS = \
          $(top_builddir)/dbug/libdbug.la \
          $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/strings/libmystrings.la \
+         $(ZLIB_LIBS)
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

=== modified file 'unittest/unit.pl'
--- a/unittest/unit.pl	2008-01-29 17:15:38 +0000
+++ b/unittest/unit.pl	2010-09-27 11:28:40 +0000
@@ -65,7 +65,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/ || /-t\.exe\z/);
     }, @dirs;
     return @files;



More information about the commits mailing list