Merge trift2.:/MySQL/M51/mysql-5.1

into  trift2.:/MySQL/M51/push-5.1

Docs/Makefile.am

@@ -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,22 +44,22 @@ CLEAN_FILES:		$(TXT_FILES)
 
 GT = $(srcdir)/generate-text-files.pl
 
-../INSTALL-SOURCE:	mysql.info $(GT)
+../INSTALL-SOURCE:	$(srcdir)/mysql.info $(GT)
 	perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@
 
-../INSTALL-WIN-SOURCE:	mysql.info $(GT)
+../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)
+INSTALL-BINARY:	$(srcdir)/mysql.info $(GT)
 	perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@
 
-../EXCEPTIONS-CLIENT: mysql.info $(GT)
+../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)
+../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.

config/ac-macros/ssl.m4

@@ -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.])

libmysqld/Makefile.am

@@ -94,8 +94,8 @@ INC_LIB=	$(top_builddir)/regex/libregex.a \
 		$(yassl_inc_libs)
 
 if HAVE_YASSL
-yassl_inc_libs=	$(top_srcdir)/extra/yassl/src/.libs/libyassl.a \
-		$(top_srcdir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
+yassl_inc_libs=	$(top_builddir)/extra/yassl/src/.libs/libyassl.a \
+		$(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
 endif
 
 # Storage engine specific compilation options

mysql-test/mysql-test-run.pl

@@ -470,12 +470,6 @@ sub command_line_setup () {
 
   if ( $ENV{'MTR_BUILD_THREAD'} )
   {
-    # If so requested, we try to avail ourselves of a unique build thread number.
-    if ( lc($ENV{'MTR_BUILD_THREAD'}) eq 'auto' ) {
-      print "Requesting build thread... ";
-      $ENV{'MTR_BUILD_THREAD'} = mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299);
-      print "got ".$ENV{'MTR_BUILD_THREAD'}."\n";
-    }
     set_mtr_build_thread_ports($ENV{'MTR_BUILD_THREAD'});
   }
 

netware/BUILD/nwbootstrap

@@ -25,7 +25,7 @@ revision=""
 rev=""
 build=""
 suffix=""
-mwenv=""
+#obsolete   mwenv=""
 
 # show usage
 show_usage()
@@ -151,20 +151,19 @@ echo "making files writable..."
 cd $target_dir
 chmod -R u+rw,g+rw .
 
-## # edit the mvenv file
-## echo "updating the mwenv environment file..."
-mwenv="./netware/BUILD/mwenv"
-## mv -f $mwenv $mwenv.org
-## sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
-## 	-e "s;BUILD_DIR;$build_dir;g" \
-##   -e "s;VERSION;$version;g" $mwenv.org > $mwenv
-## chmod +rwx $mwenv
-
-PWD=`pwd`
-# This line will catch the default value only, let's hope it is correct
-SRC_DIR=`grep "^ *export MYDEV=" $mwenv | cut -d'=' -f2 | \
-           sed -e 's;";;g' -e "s;^;echo ;g" -e "s;$;/\`basename $PWD\`;g" | /bin/sh`
-
+#obsolete   # edit the mvenv file
+#obsolete   echo "updating the mwenv environment file..."
+#obsolete   mwenv="./netware/BUILD/mwenv"
+#obsolete   mv -f $mwenv $mwenv.org
+#obsolete   sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
+#obsolete   	-e "s;BUILD_DIR;$build_dir;g" \
+#obsolete     -e "s;VERSION;$version;g" $mwenv.org > $mwenv
+#obsolete   chmod +rwx $mwenv
+#obsolete   
+#obsolete   PWD=`pwd`
+#obsolete   # This line will catch the default value only, let's hope it is correct
+#obsolete   SRC_DIR=`grep "^ *export MYDEV=" $mwenv | cut -d'=' -f2 | \
+#obsolete              sed -e 's;";;g' -e "s;^;echo ;g" -e "s;$;/\`basename $PWD\`;g" | /bin/sh`
 
 # edit the def file versions
 echo "updating *.def file versions..."

sql/Makefile.am

@@ -155,12 +155,15 @@ sql_yacc.cc:	sql_yacc.yy
 
 sql_yacc.h:	sql_yacc.yy
 
+# Be careful here, note that we use VPATH and might or might not have
+# a pregenerated "sql_yacc.cc" in $(srcdir) or one we just built in
+# $(builddir). And it has to work if $(srcdir) == $(builddir).
 sql_yacc.o:	sql_yacc.cc sql_yacc.h $(HEADERS)
-		@SED@ -e 's/__attribute__ ((__unused__))//' sql_yacc.cc > sql_yacc.cc-new
+		@SED@ -e 's/__attribute__ ((__unused__))//' $< > sql_yacc.cc-new
 		@MV@ sql_yacc.cc-new sql_yacc.cc
 		@echo "Note: The following compile may take a long time."
 		@echo "If it fails, re-run configure with --with-low-memory"
-		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) -c sql_yacc.cc
 
 # FIXME seems like now "lex_hash.h" differs depending on configure
 # flags, so can't pregenerate and include in source TAR. Revert to

storage/ndb/config/type_kernel.mk.am

@@ -2,7 +2,7 @@
 INCLUDES += \
         -I$(srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/storage/ndb/include \
         -I$(top_srcdir)/storage/ndb/src/kernel/vm \

storage/ndb/config/type_ndbapi.mk.am

@@ -2,7 +2,7 @@
 INCLUDES += \
         -I$(srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/mysys \
 	-I$(top_srcdir)/storage/ndb/include \

storage/ndb/config/type_ndbapitest.mk.am

@@ -7,7 +7,7 @@ LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
 
 INCLUDES += -I$(top_srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/storage/ndb/include \
         -I$(top_srcdir)/storage/ndb/include/ndbapi \

storage/ndb/config/type_ndbapitools.mk.am

@@ -7,7 +7,7 @@ LDADD += \
 
 INCLUDES += -I$(srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/storage/ndb/include \
         -I$(top_srcdir)/storage/ndb/include/ndbapi \

storage/ndb/config/type_util.mk.am

 
 INCLUDES += -I$(srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/mysys \
 	-I$(top_srcdir)/storage/ndb/include \