[Pkg-mysql-commits] [mariadb-5.5] 01/02: Add patch to fix kfreebsd builds

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 7a4997284b903cb281f9107a781fa2bf16ff7ac2
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Thu Aug 7 16:38:43 2014 +0300

    Add patch to fix kfreebsd builds
---
 debian/changelog                      |  1 +
 debian/patches/20_kfreebsd_tests.diff | 20 ++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8144fc3..dd292da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mariadb-5.5 (5.5.39-1) unstable; urgency=low
 
   * New upstream release.
+  * Add patch to fix kFreeBSD builds
   * Fixed wrongly applied fix of MDEV-5957 (Closes: #752203)
 
  -- Otto Kekäläinen <otto at seravo.fi>  Thu, 07 Aug 2014 12:16:19 +0300
diff --git a/debian/patches/20_kfreebsd_tests.diff b/debian/patches/20_kfreebsd_tests.diff
new file mode 100644
index 0000000..af0ee15
--- /dev/null
+++ b/debian/patches/20_kfreebsd_tests.diff
@@ -0,0 +1,20 @@
+Author: Otto Kekäläinen <otto at seravo.fi>
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=540153
+Subject: tests not getting started on kFreeBSD
+ As per #670722 I found that the test socket created to test
+ file name truncation was barfing even for the shortened form.
+ This patch was adapted from the similar one in MySQL 5.6 package.
+Forwarded: no
+Last-Update: 2014-08-07
+--- a/mysql-test/lib/My/Platform.pm
++++ b/mysql-test/lib/My/Platform.pm
+@@ -111,6 +111,9 @@ sub check_socket_path_length {
+   # See Bug #45771
+   return 0 if ($^O eq 'aix');
+ 
++  # See Debian bug #670722 - failing on kFreeBSD even after setting short path
++  return 0 if length $path < 40;
++ 
+   require IO::Socket::UNIX;
+ 
+   my $truncated= undef;
diff --git a/debian/patches/series b/debian/patches/series
index 479a9ca..aa3cbd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+20_kfreebsd_tests.diff
 33_scripts__mysql_create_system_tables__no_test.diff
 38_scripts__mysqld_safe.sh__signals.diff
 41_scripts__mysql_install_db.sh__no_test.diff

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git