Commit 14ba2178 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kent/bk/mysql-4.1 

into  mysql.com:/home/kent/bk/mysql-5.0


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
bdb/dist/gen_rec.awk:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ndb/config/type_ndbapitools.mk.am:
  Auto merged
ndb/src/kernel/Makefile.am:
  Auto merged
parents f47d5500 8d6f67f3

libmysql_r/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ 
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include

include $(top_srcdir)/libmysql/Makefile.shared



libmysql_dir = $(top_srcdir)/libmysql



libmysqlclient_r_la_SOURCES = $(target_sources)

libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)

libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
@@ -38,7 +36,9 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags) 
# This is called from the toplevel makefile

link_sources:

	set -x; \

	for f in `cd $(libmysql_dir) && echo *.[ch]`; do \

	for d in $(top_srcdir)/libmysql $(top_builddir)/libmysql; do \

	  for f in `cd $$d && echo *.[ch]`; do \

	    rm -f $$f; \

	  @LN_CP_F@ $(libmysql_dir)/$$f $$f; \

	    @LN_CP_F@ $$d/$$f $$f; \

	  done; \

	done

libmysqld/Makefile.am

+18 −5
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ 
			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \

			-DDATADIR="\"$(MYSQLDATAdir)\"" \

			-DSHAREDIR="\"$(MYSQLSHAREdir)\""

INCLUDES=		@bdb_includes@ \

INCLUDES=		@bdb_includes@  @innodb_includes@ @ndbcluster_includes@ \

			-I$(top_builddir)/include -I$(top_srcdir)/include \

			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \

			-I$(top_builddir)/sql -I$(top_srcdir)/sql \

			-I$(top_srcdir)/sql/examples \

			-I$(top_srcdir)/regex \

			$(openssl_includes) @ZLIB_INCLUDES@
@@ -118,16 +119,28 @@ endif 
#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@

#CLEANFILES =		$(libmysqld_la_LIBADD) libmysqld.la



# This is called from the toplevel makefile

# This is called from the toplevel makefile. If we can link now

# to an existing file in source, we do that, else we assume it

# will show up in the build tree eventually (generated file).

link_sources:

	  set -x; \

	  for f in $(sqlsources); do \

	    rm -f $$f; \

	    if test -e $(top_srcdir)/sql/$$f ; \

            then \

	      @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \

            else \

	      @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \

            fi ; \

	  done; \

	  for f in $(libmysqlsources); do \

	    rm -f $$f; \

	    if test -e $(top_srcdir)/libmysql/$$f ; \

	    then \

	      @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \

	    else \

	      @LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \

	    fi ; \

	  done; \

	  for f in $(sqlexamplessources); do \

	    rm -f $$f; \

ndb/config/type_kernel.mk.am

+4 −1
Original line number Diff line number Diff line 


INCLUDES += \

        -I$(srcdir) -I$(top_srcdir)/include \

        -I$(srcdir) \

	-I$(top_builddir)/include \

	-I$(top_builddir)/ndb/include \

	-I$(top_srcdir)/include \

	-I$(top_srcdir)/ndb/include \

        -I$(top_srcdir)/ndb/src/kernel/vm \

        -I$(top_srcdir)/ndb/src/kernel/error \

ndb/config/type_ndbapi.mk.am

+4 −1
Original line number Diff line number Diff line 


INCLUDES += \

        -I$(srcdir) -I$(top_srcdir)/include \

        -I$(srcdir) \

	-I$(top_builddir)/include \

	-I$(top_builddir)/ndb/include \

	-I$(top_srcdir)/include \

	-I$(top_srcdir)/mysys \

	-I$(top_srcdir)/ndb/include \

	-I$(top_srcdir)/ndb/include/kernel \

ndb/config/type_ndbapitest.mk.am

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \ 
         $(top_builddir)/mysys/libmysys.a \

         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@



INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/include \

INCLUDES += -I$(top_srcdir) \

	-I$(top_builddir)/include \

	-I$(top_builddir)/ndb/include \

	-I$(top_srcdir)/include \

	-I$(top_srcdir)/ndb/include \

        -I$(top_srcdir)/ndb/include/ndbapi \

        -I$(top_srcdir)/ndb/include/util \