[Pkg-mysql-commits] [mariadb-5.5] 08/08: Added patch that fixes MDEV-7359 - MTR tests failed to start due to replace binary not found

[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 e06840be859eca8f89910b940ff27f5131c36468
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Sun Dec 28 17:08:52 2014 +0200

    Added patch that fixes MDEV-7359 - MTR tests failed to start due to replace binary not found
---
 debian/patches/31_fix_replace_lookup_path.diff | 22 ++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/31_fix_replace_lookup_path.diff b/debian/patches/31_fix_replace_lookup_path.diff
new file mode 100644
index 0000000..4352950
--- /dev/null
+++ b/debian/patches/31_fix_replace_lookup_path.diff
@@ -0,0 +1,22 @@
+Author: Otto Kekäläinen <otto at seravo.fi>
+Bug: https://mariadb.atlassian.net/browse/MDEV-7359
+Subject: MTR tests failed to start due to replace binary not found
+Last-Update: 2014-12-28
+
+--- old/mysql-test/mysql-test-run.pl
++++ new/mysql-test/mysql-test-run.pl
+@@ -2490,14 +2490,6 @@ sub environment_setup {
+                                  "$bindir/sql$opt_vs_config/mysql_tzinfo_to_sql");
+   $ENV{'MYSQL_TZINFO_TO_SQL'}= native_path($exe_mysql_tzinfo_to_sql);
+ 
+-  # ----------------------------------------------------
+-  # replace
+-  # ----------------------------------------------------
+-  my $exe_replace= mtr_exe_exists(vs_config_dirs('extra', 'replace'),
+-                                 "$basedir/extra/replace",
+-                                 "$path_client_bindir/replace");
+-  $ENV{'REPLACE'}= native_path($exe_replace);
+-
+   # Create an environment variable to make it possible
+   # to detect that valgrind is being used from test cases
+   $ENV{'VALGRIND_TEST'}= $opt_valgrind;
diff --git a/debian/patches/series b/debian/patches/series
index 479a9ca..0165f56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+31_fix_replace_lookup_path.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