Merge with 4.0.18

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/ctype_tis620.result-old:
  Merge rename: mysql-test/r/ctype_tis620.result -> mysql-test/r/ctype_tis620.result-old
BUILD/compile-pentium-max:
  Auto merged
BitKeeper/etc/config:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
configure.in:
  Auto merged
mysql-test/t/ctype_tis620.test-old:
  Merge rename: mysql-test/t/ctype_tis620.test -> mysql-test/t/ctype_tis620.test-old
Docs/Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0mem.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged

1 files changed, 4 insertions, 15 deletions

diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index a216a3ba5dc..7da8b022031 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -115,10 +115,12 @@ if (defined $opt_log)
 if (-x "/usr/bin/rpmbuild")
 {
 	$RPM= "/usr/bin/rpmbuild";
+	$RMSOURCE= "--rmsource --rmspec";
 }
 else
 {
 	$RPM= "/bin/rpm";
+	$RMSOURCE= "--rmspec";
 }
 
 if ($RPM)
@@ -177,7 +179,7 @@ $ENV{MYSQL_BUILD_CXX}=$opt_cxx if ($opt_cxx);
 $command= "$RPM";
 $command.= " -v" if ($opt_verbose);
 $command.= " -ba";
-$command.= " --clean" if $opt_clean;
+$command.= " --clean $RMSOURCE" if $opt_clean;
 $command.= " $SPECDIR/";
 $command.= basename($SPECFILE);
 &logger("Building RPM.");
@@ -188,7 +190,7 @@ $command.= basename($SPECFILE);
 #
 $command= "mv";
 $command.= " -v " if ($opt_verbose);
-$command.= "$SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
+$command.= " $SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
 &logger("Moving source RPM to current dir.");
 &run_command($command, "Error moving source RPM!");
 
@@ -198,19 +200,6 @@ $command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION*.$RPMARCH.rpm $PWD";
 &logger("Moving binary RPMs to current dir.");
 &run_command($command, "Error moving binary RPMs!");
 
-#
-# Clean up
-#
-if ($opt_clean)
-{
-	&logger("Removing spec file and source package");
-	unless ($opt_dry_run)
-	{
-		unlink("$SPECDIR/" . basename($SPECFILE));
-		unlink("$SOURCEDIR/$SOURCEFILE");
-	}
-}
-
 &logger("SUCCESS: RPM files successfully created.") unless ($opt_dry_run);
 exit 0;