From: Georgi Kodinov Date: July 21 2010 3:44pm Subject: bzr commit into mysql-trunk-merge branch (Georgi.Kodinov:3141) List-Archive: http://lists.mysql.com/commits/114067 Message-Id: <201007211544.o6LFiZ42023785@magare.gmz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8949493454281891701==" --===============8949493454281891701== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/kgeorge/mysql/work/merge-trunk-merge/ based on revid:georgi.kodinov@stripped 3141 Georgi Kodinov 2010-07-21 [merge] merge --===============8949493454281891701== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/georgi.kodinov@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: georgi.kodinov@stripped\ # rrdy88rdf9joxfug # target_branch: file:///home/kgeorge/mysql/work/merge-trunk-merge/ # testament_sha1: e9fdf785f8c23cd6b48a6c69157cf8fb5598a6f1 # timestamp: 2010-07-21 18:44:35 +0300 # source_branch: file:///home/kgeorge/mysql/work/merge-5.1-bugteam/ # base_revision_id: georgi.kodinov@stripped\ # or1sv96lavv0ks7g # # Begin bundle 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 --===============8949493454281891701==--