database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
Magnus Svensson
2009-02-26 11:22:13 +01:00
parent 2a001d9cc4 7627d3a107
commit 00e09900e9
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bzr-mysql/default.conf
View File

@@ -1,4 +1,4 @@
[MYSQL] [MYSQL]
post_commit_to = "commits@lists.mysql.com" post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com"
tree_name = "mysql-5.1" tree_name = "mysql-5.1-mtr"

2
configure.in
View File

@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
# #
# When changing major version number please also check switch statement # When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version(). # in mysqlbinlog::check_master_version().
AM_INIT_AUTOMAKE(mysql, 5.1.32) AM_INIT_AUTOMAKE(mysql, 5.1.33)
AM_CONFIG_HEADER([include/config.h:config.h.in]) AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10

10
mysql-test/lib/My/Platform.pm
View File

@@ -113,8 +113,8 @@ sub check_socket_path_length {
# Create a tempfile name with same length as "path" # Create a tempfile name with same length as "path"
my $tmpdir = tempdir( CLEANUP => 0); my $tmpdir = tempdir( CLEANUP => 0);
my $len = length($path) - length($tmpdir); my $len = length($path) - length($tmpdir) - 1;
my $testfile = $tmpdir . "x" x ($len > 0 ? $len : 1); my $testfile = $tmpdir . "/" . "x" x ($len > 0 ? $len : 1);
my $sock; my $sock;
eval { eval {
$sock= new IO::Socket::UNIX $sock= new IO::Socket::UNIX
@@ -126,17 +126,15 @@ sub check_socket_path_length {
die "Could not create UNIX domain socket: $!" die "Could not create UNIX domain socket: $!"
unless defined $sock; unless defined $sock;
die "UNIX domain socket patch was truncated" die "UNIX domain socket path was truncated"
unless ($testfile eq $sock->hostpath()); unless ($testfile eq $sock->hostpath());
$truncated= 0; # Yes, it worked! $truncated= 0; # Yes, it worked!
}; };
#print "check_socket_path_length, failed: ", $@, '\n' if ($@);
$sock= undef; # Close socket $sock= undef; # Close socket
unlink($testfile); # Remove the physical file rmtree($tmpdir); # Remove the tempdir and any socket file created
rmdir($tmpdir); # Remove the tempdir
return $truncated; return $truncated;
} }