Commit b70cdee8 authored by df@kahlann.erinye.com's avatar df@kahlann.erinye.com

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
parents 45b6bafe f1ccd9cb
...@@ -85,11 +85,14 @@ bin-dist: all ...@@ -85,11 +85,14 @@ bin-dist: all
# Create initial database files for Windows installations. # Create initial database files for Windows installations.
dist-hook: dist-hook:
rm -rf `find $(distdir) -type d -name SCCS -print` rm -rf `find $(distdir) -type d -name SCCS -print`
rm -f `find $(distdir) -type l -print`
if echo "$(distdir)" | grep -q '^/' ; then \ if echo "$(distdir)" | grep -q '^/' ; then \
mkdir -p "$(distdir)/win" ; \
scripts/mysql_install_db --no-defaults --windows \ scripts/mysql_install_db --no-defaults --windows \
--basedir=$(top_srcdir) \ --basedir=$(top_srcdir) \
--datadir="$(distdir)/win/data"; \ --datadir="$(distdir)/win/data"; \
else \ else \
mkdir -p "$$(pwd)/$(distdir)/win" ; \
scripts/mysql_install_db --no-defaults --windows \ scripts/mysql_install_db --no-defaults --windows \
--basedir=$(top_srcdir) \ --basedir=$(top_srcdir) \
--datadir="$$(pwd)/$(distdir)/win/data"; \ --datadir="$$(pwd)/$(distdir)/win/data"; \
......
...@@ -1059,7 +1059,7 @@ sub sleep_until_file_created ($$$) { ...@@ -1059,7 +1059,7 @@ sub sleep_until_file_created ($$$) {
# Print extra message every 60 seconds # Print extra message every 60 seconds
my $seconds= ($loop * $sleeptime) / 1000; my $seconds= ($loop * $sleeptime) / 1000;
if ( $seconds > 1 and int($seconds) % 60 == 0 ) if ( $seconds > 1 and int($seconds * 10) % 600 == 0 )
{ {
my $left= $timeout - $seconds; my $left= $timeout - $seconds;
mtr_warning("Waited $seconds seconds for $pidfile to be created, " . mtr_warning("Waited $seconds seconds for $pidfile to be created, " .
......
...@@ -1236,6 +1236,12 @@ sub command_line_setup () { ...@@ -1236,6 +1236,12 @@ sub command_line_setup () {
sub set_mtr_build_thread_ports($) { sub set_mtr_build_thread_ports($) {
my $mtr_build_thread= shift; my $mtr_build_thread= shift;
if ( lc($mtr_build_thread) eq 'auto' ) {
print "Requesting build thread... ";
$ENV{'MTR_BUILD_THREAD'} = $mtr_build_thread = mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299);
print "got ".$mtr_build_thread."\n";
}
# Up to two masters, up to three slaves # Up to two masters, up to three slaves
$opt_master_myport= $mtr_build_thread * 10 + 10000; # and 1 $opt_master_myport= $mtr_build_thread * 10 + 10000; # and 1
$opt_slave_myport= $opt_master_myport + 2; # and 3 4 $opt_slave_myport= $opt_master_myport + 2; # and 3 4
......
...@@ -386,7 +386,7 @@ install -d $RBR%{_sbindir} ...@@ -386,7 +386,7 @@ install -d $RBR%{_sbindir}
# Install all binaries # Install all binaries
(cd $MBD && make install DESTDIR=$RBR) (cd $MBD && make install DESTDIR=$RBR benchdir_root=%{_datadir})
# Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do # Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
# the same here. # the same here.
mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/ mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
...@@ -689,6 +689,11 @@ fi ...@@ -689,6 +689,11 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
- Call "make install" using "benchdir_root=%{_datadir}",
because that is affecting the regression test suite as well.
* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com> * Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) - Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment