Commit 6c85ba39 authored by kent@mysql.com/kent-amd64.(none)'s avatar kent@mysql.com/kent-amd64.(none)
Browse files

gen_rec.awk: 

  Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree
parent 34cedd8d

acinclude.m4

+8 −8
Original line number Diff line number Diff line
@@ -1448,20 +1448,20 @@ bdb_version_ok=yes 
])



AC_DEFUN([MYSQL_TOP_BUILDDIR], [

  # Remove trailing "./" if any

  [$1]=`echo $[$1] | sed -e 's,^\./,,'`

  case "$[$1]" in

    /* ) ;;		# don't do anything with an absolute path

    "$srcdir"/* )

    "bdb" | "$srcdir/bdb" | "$top_srcdir/bdb" | "$abs_top_srcdir/bdb" )

      # If BDB is under the source directory, we need to look under the

      # build directory for bdb/build_unix.

      # NOTE: I'm being lazy, and assuming the user did not specify

      # something like --with-berkeley-db=bdb (it would be missing "./").

      [$1]="\$(top_builddir)/"`echo "$[$1]" | sed -e "s,^$srcdir/,,"`

      [$1]="\$(top_builddir)/bdb"

      ;;

    /* ) ;;  # Other absolute path is assume to be external BDB directory

    * )

      AC_MSG_ERROR([The BDB directory must be directly under the MySQL source directory, or be specified using the full path. ('$srcdir'; '$[$1]')])

      ;;

  esac

  if test X"$[$1]" != "/"

  if test X"$[$1]" != X"/"

  then

    [$1]=`echo $[$1] | sed -e 's,/$,,'`

  fi
@@ -1493,7 +1493,7 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [ 
      AC_MSG_RESULT([Using Innodb])

      AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])

      have_innodb="yes"

      innodb_includes="-I../innobase/include"

      innodb_includes="-I\$(top_builddir)/innobase/include -I\$(top_srcdir)/innobase/include"

      innodb_system_libs=""

dnl Some libs are listed several times, in order for gcc to sort out

dnl circular references.
@@ -1812,7 +1812,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ 
      AC_MSG_RESULT([Using NDB Cluster])

      AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])

      have_ndbcluster="yes"

      ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"

      ndbcluster_includes="-I\$(top_builddir)/ndb/include -I\$(top_srcdir)/ndb/include -I\$(top_srcdir)/ndb/include/ndbapi"

      ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"

      ndbcluster_system_libs=""

      ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"

bdb/dist/gen_rec.awk

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ BEGIN { 
		t = types[i];

		if (modes[i] == "POINTER") {

			ndx = index(t, "*");

			t = substr(types[i], 0, ndx - 2);

			t = substr(types[i], 1, ndx - 2);

		}

		printf("\t%s\t%s;\n", t, vars[i]) >> HFILE

	}

configure.in

+4 −2
Original line number Diff line number Diff line
@@ -46,12 +46,14 @@ do 
  case $host_os in

    netware* | modesto*)

      echo "$i/errmsg.sys: $i/errmsg.txt

	\$(top_builddir)/extra/comp_err.linux -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \

	mkdir -p $i

	\$(top_builddir)/extra/comp_err.linux -C\$(srcdir)/charsets/ \$(srcdir)/$i/errmsg.txt $i/errmsg.sys" \

      >> $AVAILABLE_LANGUAGES_ERRORS_RULES

      ;;

    *)

  echo "$i/errmsg.sys: $i/errmsg.txt

	\$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \

	mkdir -p $i

	\$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ \$(srcdir)/$i/errmsg.txt $i/errmsg.sys" \

    >> $AVAILABLE_LANGUAGES_ERRORS_RULES

      ;;

  esac

libmysql_r/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ INCLUDES = @MT_INCLUDES@ \ 
## 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)

libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
@@ -40,7 +38,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

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

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

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

INCLUDES=		@MT_INCLUDES@ @bdb_includes@ \

INCLUDES=		@MT_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_srcdir)/regex \

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

			-I$(top_srcdir)/sql/examples \

			-I$(top_srcdir)/regex \

			$(openssl_includes) @ZLIB_INCLUDES@



noinst_LIBRARIES =	libmysqld_int.a
@@ -118,16 +120,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; \