bk commit into 5.0 tree (kent:1.2131)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2131 06/04/01 05:53:37 kent@stripped +2 -0
  Merge

  support-files/mysql.spec.sh
    1.134 06/04/01 05:53:26 kent@stripped +4 -4

  mysql-test/Makefile.am
    1.67 06/04/01 05:51:44 kent@stripped +1 -2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-new/RESYNC

--- 1.133/support-files/mysql.spec.sh	2006-03-03 20:29:52 +01:00
+++ 1.134/support-files/mysql.spec.sh	2006-04-01 05:53:26 +02:00
@@ -238,6 +238,7 @@
 	CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS \
 	          -felide-constructors -fno-exceptions -fno-rtti \
 		  }\" \
+	LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \
 	./configure \
  	    $* \
 	    --enable-assembler \
@@ -723,6 +724,10 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Sat Apr 01 2006 Kent Boortz <kent@stripped>
+
+- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
+
 * Fri Mar 03 2006 Kent Boortz <kent@stripped>
 
 - Don't output an embedded package as it is empty

--- 1.66/mysql-test/Makefile.am	2005-11-04 01:41:32 +01:00
+++ 1.67/mysql-test/Makefile.am	2006-04-01 05:51:44 +02:00
@@ -32,8 +32,9 @@
 
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
-EXTRA_SCRIPTS = 	mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp
+EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh valgrind.supp
 EXTRA_DIST = 		$(EXTRA_SCRIPTS) 
+dist_bin_SCRIPTS =	mysql-test-run.pl
 test_SCRIPTS = 		mysql-test-run install_test_db 
 test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \
 	std_data/server-cert.pem std_data/server-key.pem