diff options
| -rwxr-xr-x | Build-tools/Do-rpm | 9 | ||||
| -rw-r--r-- | Docs/manual.texi | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index 123f6332398..6ce8c9c3e45 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -115,7 +115,8 @@ set -x rm -rf $rpmdir/BUILD/mysql-* rm -f $rpmdir/SOURCES/mysql-* rm -f $rpmdir/SRPMS/MySQL-* -rm -f $rpmdir/SPEC/mysql-* +rm -f $rpmdir/SPECS/mysql-* +rm -rf /var/tmp/mysql # Copy MySQL source and spec files @@ -162,7 +163,7 @@ if [ ! x$skip_perl=x1 ]; then set -x # First clean up so we do not get old versions when wildcard matching - rm -f $rpmdir/SOURCES/DBI-*.spec + rm -f $rpmdir/SOURCES/DBI-*.spec $rpmdir/SOURCES/mysql* rm -f $rpmdir/RPMS/i386/Perl-*.rpm rm -f $rpmdir/SRPMS/Perl-*.rpm rm -f $rpmdir/RPMS/i386/MySQL*-$VER_NO_DASH*.rpm @@ -232,5 +233,9 @@ if [ x$local_build != x1 ]; then # And the perl ones #scp $owner@$bmachine:$rpmdir/RPMS/i386/Perl*-*.rpm $bpath/NEW-RPMS #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS + + #Remove some of the files that can interfere with future builds + + rm -rf /var/tmp/mysql fi ) > $log 2>&1 diff --git a/Docs/manual.texi b/Docs/manual.texi index 4e544032792..28219eabcaf 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -47363,6 +47363,8 @@ Added documentation for @code{libmysqld}, the embedded MySQL server library. Also added example programs (a @code{mysql} client and @code{mysqltest} test program) which use @code{libmysqld}. @item +Removed all Gemini hooks from MySQL. +@item Removed @code{my_thread_init()} and @code{my_thread_end()} from mysql_com.h, and added @code{mysql_thread_init()} and @code{mysql_thread_end()} to mysql.h. |