Commit eb63927c authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/home/kent/bk/mysql-4.1-merge
parents a3d04155 f53733db

Docs/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -40,22 +40,22 @@ CLEAN_FILES: $(TXT_FILES) 
GT = $(srcdir)/Support/generate-text-files.pl



../INSTALL-SOURCE:	mysql.info $(GT)

	perl -w $(GT) $< "installing-source" "windows-source-build" > $@

	perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@



../INSTALL-WIN-SOURCE:	mysql.info $(GT)

	perl -w $(GT) $< "windows-source-build" "post-installation" > $@

	perl -w $(GT) $(srcdir)/mysql.info "windows-source-build" "post-installation" > $@



# We put the description for the binary installation here so that

# people who download source wont have to see it. It is moved up to

# the toplevel by the script that makes the binary tar files.

INSTALL-BINARY:	mysql.info $(GT)

	perl -w $(GT) $< "installing-binary" "installing-source" > $@

	perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

	perl -w $(GT) $< "mysql-floss-license-exception" "function-index" > $@

	perl -w $(GT) $(srcdir)/mysql.info "mysql-floss-license-exception" "function-index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

	perl -w $(GT) $< "mac-os-x-installation" "netware-installation" > $@

	perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@



# Don't update the files from bitkeeper

%::SCCS/s.%

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