From: Date: July 3 2009 2:13pm
Subject: bzr commit into mysql-5.1 branch (df:2953)
List-Archive: http://lists.mysql.com/commits/77905
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0513956425=="

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

#At file:///Users/df/bzr/mysql-5.1-build/ based on revid:df@stripped

 2953 Daniel Fischer	2009-07-03 [merge]
      merge fix

    modified:
      sql-bench/README*
      tests/grant.pl*
=== modified file 'sql-bench/README' (properties changed: +x to -x)
=== modified file 'tests/grant.pl' (properties changed: -x to +x)

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: df@stripped
# target_branch: file:///Users/df/bzr/mysql-5.1-build/
# testament_sha1: c938550d405347fa7afa4aceabc3f7be91cdd0ee
# timestamp: 2009-07-03 14:13:34 +0200
# source_branch: file:///Users/df/bzr/mysql-5.1-build-34521/
# base_revision_id: df@stripped
# 
# Begin bundle
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


--===============0513956425==--