From: Martin Zaun Date: October 22 2010 7:52am Subject: bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3319) List-Archive: http://lists.mysql.com/commits/121632 Message-Id: <201010220754.o9LEhdCk023190@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1644613196==" --===============1644613196== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mz/mysql/ndb-6.3/ based on revid:martin.zaun@stripped 3319 Martin Zaun 2010-10-22 [merge] remove newly added NDB_RESTORE def from mtr --===============1644613196== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.zaun@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@stripped # target_branch: file:///Users/mz/mysql/ndb-6.3/ # testament_sha1: f6a7c6b186a65df2a5f3192e111927c32b1a5e3f # timestamp: 2010-10-22 00:52:52 -0700 # source_branch: file:///Users/mz/mysql/ndb-6.3-int64constants/ # base_revision_id: martin.zaun@stripped\ # 856h2lgb68idebl1 # # Begin bundle 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 5o3KBQXpxcvbw9xdyRThQkLAIjnQ --===============1644613196==--