1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown 2006-12-01 10:27:19 +01:00
commit 114197b589
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -92,11 +92,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"; \

2
mysql-test/lib/mtr_process.pl
View File

@ -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, " .

8
mysql-test/mysql-test-run.pl
View File

@ -1233,9 +1233,15 @@ sub command_line_setup () {
# But a fairly safe range seems to be 5001 - 32767 # But a fairly safe range seems to be 5001 - 32767
# #
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