Merge mysql.com:/home/kent/bk/mysql-5.0-build

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


Docs/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

3 files changed, 25 insertions, 23 deletions

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 9ff8df52215..4ab92bc557f 100644
--- a/Docs/Makefile.am
+++ b/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.
diff --git a/netware/BUILD/nwbootstrap b/netware/BUILD/nwbootstrap
index 563d316ea56..2f291cde9f2 100755
--- a/netware/BUILD/nwbootstrap
+++ b/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..."
diff --git a/sql/Makefile.am b/sql/Makefile.am
index ac2f4836c15..91fe875c73d 100644
--- a/sql/Makefile.am
+++ b/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