[Pkg-mysql-commits] [mariadb-5.5] 01/02: Remove patch that has been applied upstream

Otto Kekäläinen ottok-guest at moszumanska.debian.org
Sun Mar 2 22:00:45 UTC 2014


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 2b489de536250857abdd795df7ef6e428488c337
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Sun Mar 2 23:46:17 2014 +0200

    Remove patch that has been applied upstream
---
 .../80_skip_socket_test_if_user_undefined.diff     | 26 ----------------------
 debian/patches/81_clean_up_also_backup_files.diff  | 10 ---------
 debian/patches/series                              |  2 --
 3 files changed, 38 deletions(-)

diff --git a/debian/patches/80_skip_socket_test_if_user_undefined.diff b/debian/patches/80_skip_socket_test_if_user_undefined.diff
deleted file mode 100755
index 2298f5c..0000000
--- a/debian/patches/80_skip_socket_test_if_user_undefined.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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-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;
- }
- 
-+if (!$USER) {
-+  skip USER variable is undefined;
-+}
-+
- let $plugindir=`SELECT @@global.plugin_dir`;
- 
- eval install plugin unix_socket soname '$AUTH_SOCKET_SO';
diff --git a/debian/patches/81_clean_up_also_backup_files.diff b/debian/patches/81_clean_up_also_backup_files.diff
deleted file mode 100644
index 0704358..0000000
--- a/debian/patches/81_clean_up_also_backup_files.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old/cmake/install_macros.cmake	2014-01-22 23:02:37 +0000
-+++ new/cmake/install_macros.cmake	2014-02-10 09:00:11 +0000
-@@ -397,6 +397,7 @@
-       PATTERN "*.vcxproj.filters" EXCLUDE
-       PATTERN "*.vcxproj.user" EXCLUDE
-       PATTERN "CTest" EXCLUDE
-+      PATTERN "*~" EXCLUDE
-     )
-   ENDIF()
- ENDFUNCTION()
diff --git a/debian/patches/series b/debian/patches/series
index ad73139..20f2f9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,5 @@
 44_scripts__mysql_config__libs.diff
 50_mysql-test__db_test.diff
 61_replace_dash_with_bash_mbug675185.diff
-80_skip_socket_test_if_user_undefined.diff
-81_clean_up_also_backup_files.diff
 82_extend_default_test_timeout_for_tokudb.diff
 99_remove_rename_mariadb-server_files_in.diff

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



More information about the Pkg-mysql-commits mailing list