From: marko.makela Date: June 8 2010 11:41am Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3501 to 3502) List-Archive: http://lists.mysql.com/commits/110471 Message-Id: <201006081141.o58B89sW027889@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1616107517==" --===============1616107517== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDM1MDIgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wOAogICAgICBidWZfcGFnZV9nZXRfZ2VuKCk6 IFBhc3MgZmlsZSxsaW5lIHRvIHJ3X2xvY2tfeF9sb2NrKCkuCgogICAgbW9kaWZpZWQ6CiAgICAg IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1Zi5jCiAzNTAxIEppbW15IFlhbmcJMjAx MC0wNi0wMwogICAgICBSZW1vdmUgdW5uY2Vzc2FyeSBuYW1lIGNvbWFwcmUgaW4gaW5ub2Jhc2Vf Z2V0X215c3FsX2tleV9udW1iZXJfZm9yX2luZGV4KCkKICAgICAgaW50cm9kdWNlZCBpbiBidWcg Zml4ICM1MzU5Miwgc2luY2UgZGljdF90YWJsZV90IGNhbiBzdWZmaWNpZW50bHkgdW5pcXVlCiAg ICAgIGlkZW50aWZ5IHRoZSB0aGUgdGFibGUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv aW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhX2lubm9kYi5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv cmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVmLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3Bs dWdpbi9idWYvYnVmMGJ1Zi5jCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDEwMDYwMzEz NDQ0OC1pdHpkdWh3Z2J3MGI4bmxoCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVm MGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjA4MTE0MDU1LTdiMDR5 dHVxejBsZGU2djEKQEAgLTIyMzYsNyArMjIzNiw3IEBAIHdhaXRfdW50aWxfdW5maXhlZDoKIAog CQlibG9jay0+cGFnZS5idWZfZml4X2NvdW50ID0gMTsKIAkJYnVmX2Jsb2NrX3NldF9pb19maXgo YmxvY2ssIEJVRl9JT19SRUFEKTsKLQkJcndfbG9ja194X2xvY2soJmJsb2NrLT5sb2NrKTsKKwkJ cndfbG9ja194X2xvY2tfZnVuYygmYmxvY2stPmxvY2ssIDAsIGZpbGUsIGxpbmUpOwogCiAJCVVO SVZfTUVNX0lOVkFMSUQoYnBhZ2UsIHNpemVvZiAqYnBhZ2UpOwogCgo= --===============1616107517== 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/mysql2a/5.1-innodb/ # testament_sha1: e3965e10160987cb75be7d1f64d263b8eef51a9a # timestamp: 2010-06-08 14:41:25 +0300 # base_revision_id: jimmy.yang@stripped\ # itzduhwgbw0b8nlh # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVDEC3QAAYFflAAwU2f//1MC QAC////wBAAIAFADZ4AUUAQ01I9VPZCMU9T9TNKaG1Dymjah6gyBkMAAAAAAAAAABgAAAAAAAAAA MAAAAAAAAAAAkkEZACZAjKeSYNQeqPUPUz1GoJ0PutOcYwtfENVL5wAsLIoNY1lUziSH55JvWSth Loizjz9cvDL2/vRavoo4iTVWM9NPrtQMKaUUd0kVl8qiZZmEl7iPZdBblTNcbO7CC/vbO5rVckc9 YFCnlY+jhAUWGEby28RooPo5KTjMWDhRTkEqc5CqKYMmX6WKkVNDovgV/7GJsnH2bjIR4ePf+TB9 GYnwpV0nYc9fonHrSJy9iB2qnL+lTlq9PCwiy443sZ66bW3CJVhxCecHK1wbPZv5R3KxfI7s5LyY o0VzmMVzUKn0fvvoiU4qhLFlRU7huaCgnsoB3G/atONJjtvFkKLO118FXAWV90YyfKlZQVY5MO1R igmc7tV1mClc9UkVSVl94q9VVz13KiCvttVmYnF08o3K1TJJhQoyyqhXZuMbk6ZqVOCq8tWNhUSx MDPzrhBWTdU2F7UXqgzgUOTSagmEptNVdTX656FjvV+/l07r1p2TJW1Jmb3dFHGgbaVJoIHEbhfn hIGjsGwRpA2o26uA13gBmU2zLFEM8nvDgB9dmkPur6UfmQHZl9LlcLbLQb0XqeptNq2fjn2Ukx0f 6Lr6gxvyUcXZGCen1mGSvXJPOtfDTqnMnJF6RfyvKjHlgsqa6bFStg6C6mV/2XiLGKiSOQa3vRso IRJ8CrLoQCYuvtoxLGzkCWyF2iM9VSu3F/Bx0QWdD2TLTPVy379hOQUJ/NTTCw89/A+Y6Oqk2KLj vLjt1Pm29jxP09dV5CeeHm28PEk2SrXy3G8tqrTQyMkOP2seQWlkv9zwhiHMONKfKhZ4pktAO2oM 0GgTCbgW8W5TSGKl2zsx3W+Pm5W29EjoBq9z7jO3aK5+Rtm5QgfEVCugMsZRFBnLdBeahrkhzJly 48mA8NBU48O8FMPpA9OyRWFi+rlq0079rmTyFGkHuFs0T0lweiPymUVRQUqt9UYQVHw9ZwaNS3zz BqD0bVbIkh2xnu/BW1Nxupu2VEZBMHqDld+BMtd+ghlsKVO4XsKpYhJUHsuuhFQLE3kuovmLS1VB vIWff+LuSKcKEgoYgW6A --===============1616107517==--