From: marko.makela Date: May 5 2010 11:24am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3450) Bug#53256 List-Archive: http://lists.mysql.com/commits/107496 X-Bug: 53256 Message-Id: <201005051124.o45AdbIW003492@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1253789725==" --===============1253789725== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUxMDQ0MjUtMzl5NnFi ZmZnb3RyaGNrMgoKIDM0NTAgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICByb3dfbWVy Z2VfZHJvcF90ZW1wX2luZGV4ZXMoKTogTG9hZCB0aGUgdGFibGUgdmlhIHRoZSBkaWN0aW9uYXJ5 IGNhY2hlLgogICAgICBBbGxvdyBtdWx0aXBsZSBpbmRleGVzIHRvIGJlIGRyb3BwZWQuIChCdWcg IzUzMjU2KQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3Jv dzBtZXJnZS5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3Jv dzBtZXJnZS5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJnZS5jCTIw MTAtMDQtMjcgMTM6NDc6MzggKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9y b3cwbWVyZ2UuYwkyMDEwLTA1LTA1IDExOjI0OjExICswMDAwCkBAIC0yMDg3LDcgKzIwODcsNyBA QCByb3dfbWVyZ2VfZHJvcF90ZW1wX2luZGV4ZXModm9pZCkKIAkJYnRyX3BjdXJfc3RvcmVfcG9z aXRpb24oJnBjdXIsICZtdHIpOwogCQlidHJfcGN1cl9jb21taXRfc3BlY2lmeV9tdHIoJnBjdXIs ICZtdHIpOwogCi0JCXRhYmxlID0gZGljdF9sb2FkX3RhYmxlX29uX2lkKHRhYmxlX2lkKTsKKwkJ dGFibGUgPSBkaWN0X3RhYmxlX2dldF9vbl9pZF9sb3codGFibGVfaWQpOwogCiAJCWlmICh0YWJs ZSkgewogCQkJZGljdF9pbmRleF90KglpbmRleDsKCg== --===============1253789725== 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:24:19 +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= --===============1253789725==--