From: Magnus BlĂ„udd Date: October 27 2010 12:54pm Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3901) List-Archive: http://lists.mysql.com/commits/122089 Message-Id: <20101027125409.A67CE134061@pilot> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5353543593458409782==" --===============5353543593458409782== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvNy4wLyBiYXNlZCBvbiByZXZpZDptYWdu dXMuYmxhdWRkQHN1bi5jb20tMjAxMDEwMjcxMjI3NDktb3BldzFuODN6dDB6ZXFpcQoKIDM5MDEg TWFnbnVzIEJsw6V1ZGQJMjAxMC0xMC0yNwogICAgICBuZGIgLSBvbmx5IGJ1aWxkIG50X3NlcnZj LmNjIG9uIFdpbmRvd3MKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9uZGIvc3JjL2NvbW1v bi9wb3J0bGliL0NNYWtlTGlzdHMudHh0Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL25kYi9z cmMvY29tbW9uL3BvcnRsaWIvQ01ha2VMaXN0cy50eHQnCi0tLSBhL3N0b3JhZ2UvbmRiL3NyYy9j b21tb24vcG9ydGxpYi9DTWFrZUxpc3RzLnR4dAkyMDEwLTA3LTAxIDEwOjA2OjUxICswMDAwCisr KyBiL3N0b3JhZ2UvbmRiL3NyYy9jb21tb24vcG9ydGxpYi9DTWFrZUxpc3RzLnR4dAkyMDEwLTEw LTI3IDEyOjU0OjAxICswMDAwCkBAIC0yMSwxMiArMjEsMTMgQEAgSU5DTFVERV9ESVJFQ1RPUklF Uygke0NNQUtFX1NPVVJDRV9ESVJ9LwogCiBJRihXSU4zMikKICBTRVQoRVhUUkFfTElCIHdzb2Nr MzIgd3MyXzMyKQorICBTRVQoRVhUUkFfU1JDICR7Q01BS0VfU09VUkNFX0RJUn0vc3FsL250X3Nl cnZjLmNjKQogRU5ESUYoV0lOMzIpCiBBRERfTElCUkFSWShuZGJwb3J0bGliIFNUQVRJQwogICAg ICAgICAgICAgTmRiQ29uZGl0aW9uLmMgTmRiTXV0ZXguYyBuZGJfc29ja2V0LmNwcAogICAgICAg ICAgICAgTmRiRW52LmMgTmRiVGhyZWFkLmMgTmRiSG9zdC5jIE5kYlRDUC5jcHAKICAgICAgICAg ICAgIE5kYk1lbS5jIE5kYkNvbmZpZy5jIE5kYlRpY2suYyBOZGJEaXIuY3BwCi0gICAgICAgICAg ICBuZGJfZGFlbW9uLmNjICR7Q01BS0VfU09VUkNFX0RJUn0vc3FsL250X3NlcnZjLmNjKQorICAg ICAgICAgICAgbmRiX2RhZW1vbi5jYyAke0VYVFJBX1NSQ30pCiBUQVJHRVRfTElOS19MSUJSQVJJ RVMobmRicG9ydGxpYiBteXN5cyAke0VYVFJBX0xJQn0pCiAKIEFERF9FWEVDVVRBQkxFKE5kYkRp ci10Cgo= --===============5353543593458409782== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/magnus.blaudd@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@stripped # target_branch: file:///home/msvensson/mysql/7.0/ # testament_sha1: 8e418fca88a74b44b958853fc219ab923481b020 # timestamp: 2010-10-27 14:54:09 +0200 # source_branch: bzr+ssh://peek02.mysql.com/users/msvensson/mysql/7.0/ # base_revision_id: magnus.blaudd@stripped\ # opew1n83zt0zeqiq # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUZ8uuAAAXbflABQVGP/934u nsC////6AgAIAFADkvdyk405ed3UJJIBNqjyNGTSn6ptJ4E0Q8pp5Qaep5R6j0gZJNGmmU2SbIqb KfpTyNTIM1MRgjNAQw0RqbQp6JPJP0FNAAGgAMhoAAjSKeSPSGmjIBkaANAAAAACSSIehTanlHpl NqaPTRqNAAAAA9QVfjWE7fQTF9wGDM7yBKaIrBiq7SoZbqd19DkRD3dQG9bLlGCTtppX074un+u5 VUUjlvWRjmzi1uzaVIRAdCP/uUE5yOQiErSxdvG1XUV1VTWiL18ZIjgpglt5VQUxq5gkZipZhMIc g12cZ3IIZiEYeQkKZM+cniGq7i87SpAiZOBYN13oCGYyAeMgu3EsakcZASZBVjhFY3QtKhlmmHtE NiwkJXr2JEZlWB8MRP0OFoRARWJhy5hRiNSKBzvIDDQV1xoAv1qr9gYfCwWcE8Wh1A1LRVRDKu+4 C4YSg1QwZCjPFAEiFSc8rDaLPq8lcKxVxCawwfKuhSBo1HRAFXiI0TlAMk518pZDgMGm4VKDQ25D a5YgQMNKKKPD7Dr1AveHBqBtCF16xTxGqOMHeVFTaKnj4odSUNVJXBkYsN/2IQtBI2RLXGL60NXA WtFD2kam4QAe48wsnhA5zLa670QEPLSFxGRjRKE6zu6Sc/rH5/njxkh0tLvG/TcqOxU9D9wwA817 sd1InfbdCEWe4hDXqPcot/0fG0s+5LNnENuppi+dL0SraI3PvbD4mA8ojFXhjM/AQ0Zdk8kMbyaK c2wb7J0x1yVWtx4SIi7jiNcU0cNstn50pBlxkGFti6i4EaRasjGZI6sIDWcJMb2vnWgfe6w+mA8N PdNrc70feR4VactGo7csd9jFd+KO9n83D6DMa0ysV5q6M/c49uQlCFRqCUyKqQ6aNlbGowATCxuS LCYWaoZwRP9aRcQ2MKCzLVnaPe1JsWU1VqAqiuC+Xz26IMgXK0L7YZKMlZuUg7hkMAPB7g0iM0jL Fhnpsm0+zbQIl8ROrXM5jOtrXbBSWShhcoohShOAI8QNJlAtJEv1VYUho24kiJRMcQGjFsAkC1nf bhgADGnjBxpQSycEIDYjJAddrlJmMfMwklkS3pVNfGDEzMX/b8A6KTfzjCJO1pYDm2yFmebTRguX OukIPiHK4VSQ8lw0SyDhONmCkGxG01OizBSSEYR4MMd6RFUKzz8bO9bIoFEYWwZDZHbl7BpUpgZz lRox+swizRMCekWaSQgVYQMuzpLZ4hPNih60EELhhioU1HUmiFI9epz/n+f/xdyRThQkEZ8uuAA= --===============5353543593458409782==--