Commit a18d3eff authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
parents 76b4ccbd 90feb661

Docs/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -45,22 +45,22 @@ CLEAN_FILES: $(TXT_FILES) 
GT = $(srcdir)/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" > $@



# Include the Windows manual.chm in source .tar.gz only if available.

# It is not in BitKeeper, but is downloaded from intranet by Bootstrap.

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_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ 
  ndb_cxxflags_fix=""

  TEST_NDBCLUSTER="--ndbcluster"



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

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

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

  ndbcluster_system_libs=""

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

extra/yassl/src/Makefile.am

+1 −1
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../taocrypt/include -I../taocrypt/mySTL

INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL



noinst_LTLIBRARIES = libyassl.la

libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

extra/yassl/taocrypt/benchmark/Makefile.am

+1 −1
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../mySTL

INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL

bin_PROGRAMS       = benchmark

benchmark_SOURCES  = benchmark.cpp

benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la