From: Kent Boortz
Date: May 3 2011 2:02pm
Subject: bzr commit into mysql-5.1 branch (kent.boortz:3680) Bug#43312
List-Archive: http://lists.mysql.com/commits/136575
X-Bug: 43312
Message-Id: <20110503140243.24352.qmail@helheim>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0042060293=="

--===============0042060293==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/helheim/store/bteam/bzr/kent/bug43312/mysql-5.1/ based on revid:vasil.dimov@stripped

 3680 Kent Boortz	2011-05-03
      Remove soft links in the build directory, not the source directory (Bug#43312)

    modified:
      client/Makefile.am
=== modified file 'client/Makefile.am'
--- a/client/Makefile.am	2009-09-03 12:29:25 +0000
+++ b/client/Makefile.am	2011-05-03 14:02:31 +0000
@@ -116,10 +116,10 @@ link_sources:
 	  @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
 	done; \
 	for f in $(strings_src) ; do \
-	  rm -f $(srcdir)/$$f; \
+	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
 	done; \
-	rm -f $(srcdir)/my_user.c; \
+	rm -f my_user.c; \
 	@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
 	echo timestamp > link_sources;
 


--===============0042060293==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/kent.boortz@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kent.boortz@stripped
# target_branch: file:///net/helheim/store/bteam/bzr/kent/bug43312\
#   /mysql-5.1/
# testament_sha1: 517ed3d7b053f1d6d0c9e592be727447bd9cd442
# timestamp: 2011-05-03 16:02:43 +0200
# base_revision_id: vasil.dimov@stripped\
#   kysx9jaah5gmc0fj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU5JjDEAAXZfgAAwXGf//1IK
EAS////wUAOSwxMD027XBJKaDUyA0MRppkATAoZPUZNBKImJNhBTyGVHpqegJiMyQZHoEkQCJiT0
KflRmkaNNPUPUeoDIAwAAAAGgAAAAASUkxNPUaNPUGjQaAAAAAUmYaHA5eHmZ6Vmd7YoEX7NlVTW
QpHnHkYeMVFU9eIe1UBZqXKxinw7rOJxXXa33ffdv92JusGGEO6vKWFF8CBhe9/axZnfeBX/WaQq
Fji1aFkP3M4nifnXxeSpmhEYrCF8eFpJNxfQxNxz2lCUUD02rmKZErEXOCCDfk4QnZTKqgXydrls
SmK+XZMoxARmaQ7rOgg6GjItEaWjbrR+n8E4pqH6ugXdPQ5vXQclTbRzLfPgMV1ZBmoJhZnCj4aw
kWyqHA9M3GvvlUqLex6iLtHFm1glcsbBpwE8nDxCm2HjPzta63S8xSJbkKkqLcbINyogWUk+Je1F
zngPI3dSfGc5sVcd8XUojci6sWrgJzNzrzHf5RslFMtRzNdo7CVFIPL6n6q7K+03+6wsmohypTVn
Wx1j1uUNntbUv86mWuxzu0nGLSNzkpQTTm8ygQm0Fdl8zLloX8tF3/fXkuxKdb2GZvV/4h6zNCSY
Yked7jec3Koatf5Y4O/cRHNQV4Ig4KQ+ajn0WXK970aU9S8thwyeDfLlMQFddqKDCox7bntP140U
4WYR2ekYnkp7Nxx9atZrL+DRiUt5c3RLSTj7CdaDtJXumzWugEt1o+BshQ3ffc63c0EsYTcrc5qt
J+vIm2fEnDO0Os8KIVzhOfubT6gPr6unek1qZculut0fB9w8I1Br9hs5RsyHvZZCr5r+ZF05yqyA
2827SClJUbDmvMj6ZMEo3ZKJhlcEBHMOo/UzbDiKpGp7N0VOciIlUSBim/NeaHADzaHbbDe8rGrt
5hFoK2TUKD3PA2SfJTpDUKtx0s+4VbuUgUwMqXA5E4hhrMuq6JSahYia7xHFsSK5KXmsUtWCxnMk
XGEJlNjHRpVkEGwY+0SeYmLDfcSMcCgDB0jShPwjMDVnrAUETPS1oKl0jFipUO7jVl6fdsP0ZHJd
7lKaZhMRNc7TaPRh25lu7B+sj/cFrSlIiXVLbfLJ+LFsVkD1Xs6jI8PBdJkQ6VakZbunoYgNX2Oh
bqHWo+HCRWGdiqlSpKDgKjNt1Y5S/TtFAsKbAs4Q77jvylUaxlrKgVlXHiOjUL2SpqOhNsMQuH/F
3JFOFCQTkmMMQA==


--===============0042060293==--