Commit b6004e62 authored by unknown's avatar unknown
Browse files

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

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


Makefile.am:
  Auto merged
sql-common/my_time.c:
  Auto merged
parents a49e1f4e 922ea687

Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -85,11 +85,14 @@ bin-dist: all 
# Create initial database files for Windows installations.

dist-hook:

	rm -rf `find $(distdir) -type d -name SCCS -print`

	rm -f  `find $(distdir) -type l -print`

	if echo "$(distdir)" | grep -q '^/' ; then \

          mkdir -p "$(distdir)/win" ; \

	  scripts/mysql_install_db --no-defaults --windows \

		--basedir=$(top_srcdir) \

		--datadir="$(distdir)/win/data"; \

	else \

          mkdir -p "$$(pwd)/$(distdir)/win" ; \

	  scripts/mysql_install_db --no-defaults --windows \

		 --basedir=$(top_srcdir) \

		 --datadir="$$(pwd)/$(distdir)/win/data"; \

mysql-test/lib/mtr_process.pl

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ sub sleep_until_file_created ($$$) { 


    # Print extra message every 60 seconds

    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;

      mtr_warning("Waited $seconds seconds for $pidfile to be created, " .

mysql-test/mysql-test-run.pl

+6 −0
Original line number Diff line number Diff line
@@ -1236,6 +1236,12 @@ sub command_line_setup () { 
sub set_mtr_build_thread_ports($) {

  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

  $opt_master_myport=         $mtr_build_thread * 10 + 10000; # and 1

  $opt_slave_myport=          $opt_master_myport + 2;  # and 3 4

support-files/mysql.spec.sh

+6 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ install -d $RBR%{_sbindir} 




# 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

# the same here.

mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
@@ -689,6 +689,11 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%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>



- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)