bzr commit into mysql-5.1 branch (build:3034) Bug#46834

[MySQL Build Team]

#At file:///net/helheim/store/bteam/bzr/mysql-5.1.37sp1-release/

 3034 MySQL Build Team	2009-10-05
      Add fixes for Bug#46834: Test suite missing from RPMs
      
      Additional changes from the following commits:
      
      http://lists.mysql.com/commits/81279
      http://lists.mysql.com/commits/81607
      
      These were missed when scanning 'bzr log' for changes.
      modified:
        mysql-test/Makefile.am
        mysql-test/lib/My/SafeProcess/Makefile.am
        mysql-test/lib/mtr_cases.pm
        storage/ndb/test/run-test/Makefile.am
        support-files/mysql.spec.sh

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2009-06-05 16:55:09 +0000
+++ b/mysql-test/Makefile.am	2009-10-05 18:14:43 +0000
@@ -17,7 +17,8 @@
 
 ## Process this file with automake to create Makefile.in
 
-testdir =	$(prefix)/mysql-test
+testroot = $(prefix)
+testdir =  $(testroot)/mysql-test
 
 test_SCRIPTS =	mtr \
 		mysql-test-run \

=== modified file 'mysql-test/lib/My/SafeProcess/Makefile.am'
--- a/mysql-test/lib/My/SafeProcess/Makefile.am	2008-03-13 16:07:11 +0000
+++ b/mysql-test/lib/My/SafeProcess/Makefile.am	2009-10-05 18:14:43 +0000
@@ -13,7 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-safedir = $(prefix)/mysql-test/lib/My/SafeProcess
+testroot = $(prefix)
+safedir = $(testroot)/mysql-test/lib/My/SafeProcess
 #nobase_bin_PROGRAMS = ...
 safe_PROGRAMS =		my_safe_process
 

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-05-25 20:58:31 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2009-10-05 18:14:43 +0000
@@ -239,7 +239,8 @@ sub collect_one_suite($)
     else
     {
       $suitedir= my_find_dir($::basedir,
-			     ["mysql-test/suite",
+			     ["share/mysql-test/suite",
+			      "mysql-test/suite",
 			      "mysql-test",
 			      # Look in storage engine specific suite dirs
 			      "storage/*/mysql-test-suites"

=== modified file 'storage/ndb/test/run-test/Makefile.am'
--- a/storage/ndb/test/run-test/Makefile.am	2007-08-31 14:12:51 +0000
+++ b/storage/ndb/test/run-test/Makefile.am	2009-10-05 18:14:43 +0000
@@ -13,7 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-testdir=$(prefix)/mysql-test/ndb
+testroot=$(prefix)
+testdir=$(testroot)/mysql-test/ndb
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_util.mk.am

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2009-09-22 20:38:25 +0000
+++ b/support-files/mysql.spec.sh	2009-10-05 18:14:43 +0000
@@ -886,6 +886,10 @@ fi
 
 - Update variable used for mysql-test suite location to match source.
 
+* Thu Aug 20 2009 Jonathan Perkin <jperkin@stripped>
+
+- Update variable used for mysql-test suite location to match source.
+
 * Fri Nov 07 2008 Joerg Bruehe <joerg@stripped>
 
 - Correct yesterday's fix, so that it also works for the last flag,