[Pkg-mysql-commits] r1903 - in mysql-dfsg-5.1/branches/unstable/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2010-08-20 15:22:43 +0000 (Fri, 20 Aug 2010)
New Revision: 1903

Added:
   mysql-dfsg-5.1/branches/unstable/debian/patches/99_fix_testsuite_for_installed_env.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/00list
Log:
Add patch 99_fix_testsuite_for_installed_env.dpatch from Ubuntu to fix mysql-testsuite to work with the installation location.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-08-16 19:34:58 UTC (rev 1902)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-08-20 15:22:43 UTC (rev 1903)
@@ -3,10 +3,12 @@
   * Check for server binary before executing any script. (closes: #583611)
   * Move my_print_defaults and perror from mysql-server-5.1 to mysql-client-5.1
     package. (closes: #591373)
+  * Add patch 99_fix_testsuite_for_installed_env.dpatch from Ubuntu to fix
+    mysql-testsuite to work with the installation location.
+  * Add README.source file to make lintian happy.
   * Update Standards-Version to 3.9.1, no changes required.
-  * Add README.source file to make lintian happy.
 
- -- Norbert Tretkowski <norbert at tretkowski.de>  Sat, 07 Aug 2010 11:23:52 +0200
+ -- Norbert Tretkowski <norbert at tretkowski.de>  Fri, 20 Aug 2010 17:19:01 +0200
 
 mysql-5.1 (5.1.49-1) unstable; urgency=low
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-08-16 19:34:58 UTC (rev 1902)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-08-20 15:22:43 UTC (rev 1903)
@@ -7,3 +7,4 @@
 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

Added: mysql-dfsg-5.1/branches/unstable/debian/patches/99_fix_testsuite_for_installed_env.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/99_fix_testsuite_for_installed_env.dpatch	                        (rev 0)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/99_fix_testsuite_for_installed_env.dpatch	2010-08-20 15:22:43 UTC (rev 1903)
@@ -0,0 +1,36 @@
+#! /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"