[Pkg-mysql-commits] r1949 - mysql-5.1/branches/unstable/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2011-02-04 15:42:03 +0000 (Fri, 04 Feb 2011)
New Revision: 1949

Removed:
   mysql-5.1/branches/unstable/debian/patches/99_fix_testsuite_for_installed_env.dpatch
Modified:
   mysql-5.1/branches/unstable/debian/patches/00list
Log:
Drop patch 99_fix_testsuite_for_installed_env.dpatch, no longer required.

Modified: mysql-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-5.1/branches/unstable/debian/patches/00list	2011-02-04 15:40:23 UTC (rev 1948)
+++ mysql-5.1/branches/unstable/debian/patches/00list	2011-02-04 15:42:03 UTC (rev 1949)
@@ -7,4 +7,3 @@
 41_scripts__mysql_install_db.sh__no_test.dpatch
 44_scripts__mysql_config__libs.dpatch
 50_mysql-test__db_test.dpatch
-99_fix_testsuite_for_installed_env.dpatch

Deleted: mysql-5.1/branches/unstable/debian/patches/99_fix_testsuite_for_installed_env.dpatch
===================================================================
--- mysql-5.1/branches/unstable/debian/patches/99_fix_testsuite_for_installed_env.dpatch	2011-02-04 15:40:23 UTC (rev 1948)
+++ mysql-5.1/branches/unstable/debian/patches/99_fix_testsuite_for_installed_env.dpatch	2011-02-04 15:42:03 UTC (rev 1949)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_fix_testsuite_for_installed_env.dpatch by Steve Beattie <sbeattie at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the mysql testsuite to work in the installed locations
-
- at DPATCH@
-diff -urNad mysql-5.1-5.1.49~/mysql-test/lib/My/ConfigFactory.pm mysql-5.1-5.1.49/mysql-test/lib/My/ConfigFactory.pm
---- mysql-5.1-5.1.49~/mysql-test/lib/My/ConfigFactory.pm	2010-07-09 05:34:55.000000000 -0700
-+++ mysql-5.1-5.1.49/mysql-test/lib/My/ConfigFactory.pm	2010-08-12 16:40:07.000000000 -0700
-@@ -140,10 +140,13 @@
-   return $vardir;
- }
- 
-+my @std_data_prefixes=("mysql-test", "lib/mysql-testsuite");
-+
- sub fix_std_data {
-   my ($self, $config, $group_name, $group)= @_;
-   my $basedir= $self->get_basedir($group);
--  return "$basedir/mysql-test/std_data";
-+  return my_find_dir($self->get_basedir($group),
-+		     \@std_data_prefixes, "std_data");
- }
- 
- sub ssl_supported {
-diff -urNad mysql-5.1-5.1.49~/mysql-test/lib/mtr_cases.pm mysql-5.1-5.1.49/mysql-test/lib/mtr_cases.pm
---- mysql-5.1-5.1.49~/mysql-test/lib/mtr_cases.pm	2010-07-09 05:34:53.000000000 -0700
-+++ mysql-5.1-5.1.49/mysql-test/lib/mtr_cases.pm	2010-08-12 16:34:10.000000000 -0700
-@@ -268,6 +268,7 @@
-     {
-       $suitedir= my_find_dir($::basedir,
- 			     ["mysql-test/suite",
-+			      "lib/mysql-testsuite/suite",
- 			      "mysql-test",
- 			      # Look in storage engine specific suite dirs
- 			      "storage/*/mysql-test-suites"