Commit dbe85caf authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint


client/mysql_upgrade.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
include/my_sys.h:
  Manual merge - my_getpagesize defined further down separate from HAVE_SYS_MMAN_H
parents 74ff94ec 8f71610f

Docs/Makefile.am

+11 −11
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ all-local: $(TXT_FILES) 
# make sure that "make install" installs the info page, too

# automake only seems to take care of this automatically,

# if we're building the info page from texi directly.

install-data-hook:	mysql.info

install-data-hook:	$(srcdir)/mysql.info

	$(mkinstalldirs) $(DESTDIR)$(infodir)

	$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
@@ -44,23 +44,23 @@ 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" > $@

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

	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" > $@

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

	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" > $@

INSTALL-BINARY:	$(srcdir)/mysql.info $(GT)

	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" > $@

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

	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" > $@

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

	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.

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"

config/ac-macros/ssl.m4

+2 −3
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [ 
  yassl_dir="yassl"

  AC_SUBST([yassl_dir])



  yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"

  yassl_libs="\$(top_builddir)/extra/yassl/src/libyassl.la \

              \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la"

  AC_SUBST(yassl_libs)

  yassl_includes="-I\$(top_srcdir)/extra/yassl/include"

  AC_SUBST(yassl_includes)



  AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for SSL.])

  AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for SSL.])

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