← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to debian/patches/20_kfreebsd_tests.diff

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-08-27 21:12:36 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140827211236-se41hwfe4xy0hpef
http://bugs.debian.org/759309
http://bugs.debian.org/759813
* d/control: Removed Provides: libmysqlclient-dev (Closes: #759309)
* d/control: Removed Provides: libmysqld-dev with same motivation
* Re-introduced tha HPPA build patch as the upstream fix wasn't complete
* Fixed all kFreeBSD build and test suite issues
* Added Italian translation (Closes: #759813)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/20_kfreebsd_tests.diff
 
1
Author: Otto Kekäläinen <otto@seravo.fi>
 
2
Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=540153
 
3
Subject: tests not getting started on kFreeBSD
 
4
 As per #670722 I found that the test socket created to test
 
5
 file name truncation was barfing even for the shortened form.
 
6
 This patch was adapted from the similar one in MySQL 5.6 package.
 
7
Forwarded: no
 
8
Last-Update: 2014-08-07
 
9
--- a/mysql-test/lib/My/Platform.pm
 
10
+++ b/mysql-test/lib/My/Platform.pm
 
11
@@ -111,6 +111,9 @@ sub check_socket_path_length {
 
12
   # See Bug #45771
 
13
   return 0 if ($^O eq 'aix');
 
14
 
 
15
+  # See Debian bug #670722 - failing on kFreeBSD even after setting short path
 
16
+  return 0 if length $path < 40;
 
17
+ 
 
18
   require IO::Socket::UNIX;
 
19
 
 
20
   my $truncated= undef;