[Pkg-mysql-commits] [mariadb-5.5] 01/01: Mark LP bug for closing. Update test fix patch to avoid unix_socket issue

[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 5148e9e7d0d18bf6bf747757a2b7cf6577800929
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Thu Feb 6 13:33:03 2014 +0200

    Mark LP bug for closing. Update test fix patch to avoid unix_socket issue
---
 debian/changelog                                       |  1 +
 .../patches/80_skip_socket_test_if_user_undefined.diff | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31400b4..bfa9450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mariadb-5.5 (5.5.35-1) unstable; urgency=low
   * Updated French debconf translation (Closes: #736480)
   * Upstream includes fix for CVE-2014-0001 (Closes: #737597)
   * Renamed SONAME properly (Closes: #732967)
+  * Package tested to be Ubuntu-compatible (LP: #519478)
 
  -- Otto Kekäläinen <otto at seravo.fi>  Wed, 29 Jan 2014 21:09:51 +0300
 
diff --git a/debian/patches/80_skip_socket_test_if_user_undefined.diff b/debian/patches/80_skip_socket_test_if_user_undefined.diff
index d4ec1d5..a5319eb 100755
--- a/debian/patches/80_skip_socket_test_if_user_undefined.diff
+++ b/debian/patches/80_skip_socket_test_if_user_undefined.diff
@@ -4,9 +4,23 @@
 
 @DPATCH@
 === modified file 'mysql-test/suite/plugins/t/unix_socket.test'
+=== modified file 'mysql-test/suite/plugins/t/unix_socket.test'
 --- old/mysql-test/suite/plugins/t/unix_socket.test	2013-05-14 12:49:52 +0000
-+++ new/mysql-test/suite/plugins/t/unix_socket.test	2014-02-03 21:25:29 +0000
-@@ -7,6 +7,10 @@
++++ new/mysql-test/suite/plugins/t/unix_socket.test	2014-02-05 10:25:37 +0000
+@@ -3,10 +3,23 @@
+ # get .result differences from CURRENT_USER().
+ --source include/not_as_root.inc
+ 
++# The previous check verifies that the user does not have root permissions. 
++# However in some cases tests are run under a user named 'root',
++# even although this user does not have real root permissions. 
++# This test should be skipped in this case, since it does not expect
++# that there are records in mysql.user where user=<username>
++if ($USER=="root") {
++  skip Cannot be run by user named 'root' even if it does not have all privileges;
++}
++
+ if (!$AUTH_SOCKET_SO) {
    skip No auth_socket plugin;
  }
  

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