Commit 048dfce0 authored by unknown's avatar unknown
Browse files

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

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


sql-common/my_time.c:
  Auto merged
parents 880b3d84 e9c502b3

Docs/Makefile.am

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



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

	perl -w $(GT) mysql.info "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) mysql.info "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) mysql.info "installing-binary" "installing-source" > $@

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



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

	perl -w $(GT) mysql.info "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) mysql.info "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.%

client/mysql_upgrade.c

+8 −6
Original line number Diff line number Diff line
@@ -373,14 +373,17 @@ static int comp_names(struct fileinfo *a, struct fileinfo *b) 
}





static int 

find_file(const char *name, const char *root, uint flags, char *result, size_t len, ...)

static int find_file(const char *name, const char *root,

                     uint flags, char *result, size_t len, ...)

{

  int ret;

  int ret= 1;

  va_list va;

  FILEINFO key= { (char*)name, NULL };

  const char *subdir;

  char *cp;

  FILEINFO key;



  /* Init key with name of the file to look for */

  key.name= (char*)name;



  DBUG_ASSERT(root != NULL);
@@ -388,7 +391,6 @@ find_file(const char *name, const char *root, uint flags, char *result, size_t l 
  if (cp[-1] != FN_LIBCHAR) 

    *cp++= FN_LIBCHAR; 

  

  ret= 1;

  va_start(va, len);

  subdir= (!(flags & MY_SEARCH_SELF)) ? va_arg(va, char *) : "";

  while (subdir)

config/ac-macros/ha_berkeley.m4

+6 −6
Original line number Diff line number Diff line
@@ -243,20 +243,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

config/ac-macros/ha_innodb.m4

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,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.

config/ac-macros/ha_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,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 -I../ndb/include/mgmapi"

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

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

      ndbcluster_system_libs=""

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