Commit c32d646d authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 

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


support-files/mysql.spec.sh:
  Auto merged
parents 36c7c608 052624e1

mysql-test/mysql-test-run.pl

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ $Devel::Trace::TRACE= 0; # Don't trace boring init stuff 
use File::Path;

use File::Basename;

use File::Copy;

use File::Temp qw / tempdir /;

use Cwd;

use Getopt::Long;

use Sys::Hostname;
@@ -1020,6 +1021,11 @@ sub command_line_setup () { 
  my $sockdir = $opt_tmpdir;

  $sockdir =~ s|/+$||;



  # On some operating systems, there is a limit to the length of a

  # UNIX domain socket's path far below PATH_MAX, so try to avoid long

  # socket path names.

  $sockdir = tempdir(CLEANUP => 1) if ( length($sockdir) > 80 );



  # Put this into a hash, will be a C struct



  $master->[0]=

support-files/mysql.spec.sh

+4 −0
Original line number Diff line number Diff line
@@ -755,6 +755,10 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>



- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.



* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>



- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"