From: marko.makela Date: May 4 2010 10:53am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3439) List-Archive: http://lists.mysql.com/commits/107347 Message-Id: <201005041054.o44As2ZZ024266@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1174868370==" --===============1174868370== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQxMDUzMjQtdTU3ZHZ0 MDFpcWJ6d2FpbAoKIDM0MzkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBVbmNvbW1l bnQgVU5JVl9CVFJfQVZPSURfQ09QWS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v ZGJfcGx1Z2luL0NoYW5nZUxvZwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1 Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwkyMDEw LTA1LTAzIDEyOjI4OjU5ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VM b2cJMjAxMC0wNS0wNCAxMDo1Mzo0OSArMDAwMApAQCAtNDgsMTIgKzQ4LDYgQEAKIAlPbmx5IGNo ZWNrIHRoZSByZWNvcmQgc2l6ZSBhdCBpbmRleCBjcmVhdGlvbiB0aW1lIHdoZW4KIAlpbm5vZGJf c3RyaWN0X21vZGUgaXMgc2V0IG9yIHdoZW4gUk9XX0ZPUk1BVCBpcyBEWU5BTUlDIG9yIENPTVBS RVNTRUQuCiAKLTIwMTAtMDQtMjAJVGhlIElubm9EQiBUZWFtCi0KLQkqIGJ0ci9idHIwYnRyLmMs IGluY2x1ZGUvdW5pdi5pOgotCUltcGxlbWVudCBVTklWX0JUUl9BVk9JRF9DT1BZLCBmb3IgYXZv aWRpbmcgd3JpdGVzIHdoZW4gYSBCLXRyZWUKLQlub2RlIGlzIHNwbGl0IGF0IHRoZSBmaXJzdCBv ciBsYXN0IHJlY29yZC4KLQogMjAxMC0wNC0xNQlUaGUgSW5ub0RCIFRlYW0KIAogCSogdHJ4L3Ry eDByZWMuYzoKCg== --===============1174868370== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marko.makela@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@stripped # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: e46650c3dfa88420f8342a75a96a3a7d91573642 # timestamp: 2010-05-04 13:53:58 +0300 # base_revision_id: marko.makela@stripped\ # u57dvt01iqbzwail # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe70hGEAAZbfgEAQW2P//38n 1yC/7//wUAOW3t1m25OQHXCShTEmmyg9Ew1MnpHqMIYQA003pJ5QJRTSnoyY0ySfpBGhk9QAA9Ro 9IAAlI0JPSYJk1PSaNAabUBoADIABzAJgJkYARiYmEwmCGmJpgJJE0BDTBNBT8pkyRhNPJGJoNAy E+OvMX3dxXGiipKsHTMjIlQhCKxk+eZxPKqqX6z4jkZSyLFVuJ8nj+6pjzYL8NNTBJvXFRZkH51x 1sdeiNWlRCc3lJH5v6zJKSYP6EQ85yGIuS2EqWuVqWDf0pGNIvzmOEOKJpyNMy+D3NS3RSCjiekU ElygrCUcgi4BRCKBErgsBRvyZ+gsjShS63S9rEQlQM+iee+A0ikiZhh+OPA2x1B3lVPNiiWwZMRj xFLWpU/GCRUw6R6VidlsS6YtiqLcih1hYZDhHQIRnqRUaNEsIGkjJyRmkMYsqacZA4BnDhiggLIF pj6arB3KfSXZQTWnf1zwQVD1JR6qBvkJlQXlVxbFoj3EBzMpkeVV7+ZGjjAH7UNpK84+6xO2xCA1 MokE2hJS2maqA1uYoqMLlLjicSD5SNomCp5jKBxlyteYB5YJ9A8vnjTF6hkJgjMWbV3mRhYsU8LJ B+duhzotDAnoNGt0LSFzXXSZIrdIxMG7WfZZ3QdAPfxLLFVW+KvsimpkqrtVSX0zGwG4Ns0BnHB1 GYvmtI3UUJEfaRjw5LzSPtUZ4KkOigX4lEvZyCs7RiUXZw8YHE4lx3ZpJDyUDsBgylvEpKNRid5U eUuvx3CeeAtkGSFuRCPoa58pOSIxFaSieNBaOKZx5kMDktETCLuNOHTVbpPkg4tYmIUNVY0TRqo0 GsEoZeioK+ql8AzGszzqE4EifZOYais3RGBGWDi8zH45tpbscuG7asCCYG/Ww5+Y1h4JyU7AZTXs J6voKIvK6bRhiIs2hRb66HwrAnMFcBjFvtKN4vSpIsDQCuxwoUwnpEU6QyJenDLuj5kjpSKcetjz HJqlkLX66R85CU32xwA1nVIvrAIM8NDt/PpQ9kMnbgXbFCv+q9ClA3RI/iR0BQu1ypkNt9pq1aln gShPtkkG+XHIqtNynSWxe3hAVHurysnzRxgpla/OECJhkyiGa027XMJCoBkE3no9CXYW9LtOiBD+ KGYayFWYUgEgj2WdxUuzCObkKVbX9VgEqr7sVEr81bM11rbdFo5/5Jrk6/xdyRThQkO70hGE --===============1174868370==--