From: marko.makela Date: May 5 2010 11:39am Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3449 to 3450) Bug#53256 List-Archive: http://lists.mysql.com/commits/107501 X-Bug: 53256 Message-Id: <201005051139.o45BdlxH030064@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0177217039==" --===============0177217039== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDM0NTAgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICByb3dfbWVyZ2VfZHJvcF90ZW1w X2luZGV4ZXMoKTogTG9hZCB0aGUgdGFibGUgdmlhIHRoZSBkaWN0aW9uYXJ5IGNhY2hlLgogICAg ICBBbGxvdyBtdWx0aXBsZSBpbmRleGVzIHRvIGJlIGRyb3BwZWQuIChCdWcgIzUzMjU2KQoKICAg IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJnZS5jCiAz NDQ5IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMDUKICAgICAgRmFjdG9yIG91dCBpbm5vZGJfbXVs dGlfdXBkYXRlLnRlc3QgZnJvbSBpbm5vZGIudGVzdAoKICAgIGFkZGVkOgogICAgICBteXNxbC10 ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfbXVsdGlfdXBkYXRlLnJlc3VsdAogICAg ICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9kaXNhYmxlZC5kZWYKICAgICAgbXlz cWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX211bHRpX3VwZGF0ZS50ZXN0CiAg ICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2Ri LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGIudGVz dAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbWVyZ2Uu YycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbWVyZ2UuYwkyMDEwLTA0LTI3 IDEzOjQ3OjM4ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG1lcmdl LmMJMjAxMC0wNS0wNSAxMToyNDoxMSArMDAwMApAQCAtMjA4Nyw3ICsyMDg3LDcgQEAgcm93X21l cmdlX2Ryb3BfdGVtcF9pbmRleGVzKHZvaWQpCiAJCWJ0cl9wY3VyX3N0b3JlX3Bvc2l0aW9uKCZw Y3VyLCAmbXRyKTsKIAkJYnRyX3BjdXJfY29tbWl0X3NwZWNpZnlfbXRyKCZwY3VyLCAmbXRyKTsK IAotCQl0YWJsZSA9IGRpY3RfbG9hZF90YWJsZV9vbl9pZCh0YWJsZV9pZCk7CisJCXRhYmxlID0g ZGljdF90YWJsZV9nZXRfb25faWRfbG93KHRhYmxlX2lkKTsKIAogCQlpZiAodGFibGUpIHsKIAkJ CWRpY3RfaW5kZXhfdCoJaW5kZXg7Cgo= --===============0177217039== 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: 61b0709193f8f5b56a5da69b0d36e557ffc44352 # timestamp: 2010-05-05 14:39:41 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # 39y6qbffgotrhck2 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeqFIZMAAa7fgEAwW2P//3MG AAC/7//wUAPaLeO3HdmyStYSSEBNGlP000NE08QUbJM1PKPKD1BlUbSeoZqemj1RpoaANADRoABJ CIaKeEnpGp+pp6p6RkyD0Q9RoNNDAAAAAaAAAAABJQU2gxTCZTMqfpqJ4o0NBoDQL4jCMd+jffw5 HTJWDK1tu/a0SA3RvjSXVxxtu6DHnZmOvyu8I2QzHxfYf6XfEn9aDpB39id4Y7MRMdZHH7hTdn9b bDI991rS1IHWZngcTe+InKTv28SQYiw5WU6VDbMIqXdcFHGs+fwwraJtEICVyRnqLrouiJSJUMUj nPZs8X9t6QwjVQQmQYoJrv2k61aP2dsEhd3kustBVBRbBY5oIrll9gLwMT5WDYU/GlJoFK6gsdS3 3xwbUOXEgTHjTXE7sva1IsUBXXnmWSFFZcRrrplS2eGP1SkWlRAjDMoXLdaXrenECg3E+dGlRAcb hMaWHcSUHjFWYY0yJECgmpGHo3gWr6TQPYgurPTVac1NKSqwbQsyzccLNMeR0inH41qLVXpGrrUo MxQIM8g0lUguRl6qKUXQhnKBxcC2B1aybU5ZeUsi/CvmtsMptgqidZUt0xpXXlRQrhcqVtBbXemL VOhQKq6P82Z+RuYXBjow17syhEvg8vYw7a+B1+MTcqh4zM+xIxkzDM3n5PNLYUqDK5O2xwx4Tnh4 xkxT1eFJ4i0MlwGGh3nsSP9EHRzSPlhcOD5pF2BNBVa5xdJUiRlwxq0+hcPMxosLFr91SFOzmcRf FwMXrOSwMVeZGHFbEVnpTq488DRonSHxSLXNZO+y0csUJpJcThgcypUcVcbjQUvSVO3Z0uOzfpOC 1zMy0m+J17yoyh0Y6wGBGN8i/p2BVt/qYjnvfSHGcPOMbYUxqN04E5MoqnqnaxlV48rKDSnL9XbC vU5b7t2ZXjMEd/EVC7+hhcbAadax2RjjUob5pCeWhaBAaY2g4x9YMojl5cXbsAKaxm8DZ/XgXMVA vTNI3hwBeFSYka5dm1pDmjCn+bTs5tdToke5Ip28mOg5NUsZwWOGvKaKJK8RbXJGe260WAoJSDbs SlFzjifDDT7ChPwyg9kMncL2SPMeq/aClStY3xJftIrCxUtV014QTGB+UVjO2pDkbbbLCgnAK/Jz tM0w3491rFZs2KZJYK2Ap+Wahk+UNSaSQFMoP9coN6o7/OhYxZSFCIGbQ0hi43ANNUmposfXWDXD oX+a6PmmN+SIxMZbxxPDaJ8wY1ImysSsqnGftuwfVqKlS6SxAmBV5tcisvZ4preRyvOrtSm//i7k inChIdUKQyY= --===============0177217039==--