From: marko.makela Date: June 29 2010 1:12pm Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3532) Bug#54408 List-Archive: http://lists.mysql.com/commits/112466 X-Bug: 54408 Message-Id: <201006291312.o5TCOUXu025840@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1434575319==" --===============1434575319== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMDA1OC0xaWxx YWo1MXU5c2o5dnFlCgogMzUzMiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTI5CiAgICAgIENoYW5n ZUxvZyBlbnRyeSBmb3IgQnVnICM1NDQwOAoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lu bm9kYl9wbHVnaW4vQ2hhbmdlTG9nCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9w bHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJl dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI5MTMwMDU4LTFpbHFhajUxdTlzajl2 cWUKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtl bGFAb3JhY2xlLmNvbS0yMDEwMDYyOTEzMTIxOS1wamJrcGs1cnNxenRtdzI3CkBAIC0xLDQgKzEs OSBAQAogMjAxMC0wNi0yOQlUaGUgSW5ub0RCIFRlYW0KKwkqIHJvdy9yb3cwcm93LmMsIHJvdy9y b3cwdW5kby5jLCByb3cvcm93MHVwZC5jOgorCUZpeCBCdWcjNTQ0MDggdHhuIHJvbGxiYWNrIGFm dGVyIHJlY292ZXJ5OiByb3cwdW1vZC5jOjY3MworCWRpY3RfdGFibGVfZ2V0X2Zvcm1hdChpbmRl eC0+dGFibGUpCisKKzIwMTAtMDYtMjkJVGhlIElubm9EQiBUZWFtCiAKIAkqIGJ0ci9idHIwY3Vy LmMsIGluY2x1ZGUvYnRyMGN1ci5oLAogCWluY2x1ZGUvcm93MG15c3FsLmgsIHJvdy9yb3cwbWVy Z2UuYywgcm93L3JvdzBzZWwuYzoKCg== --===============1434575319== 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: 4a68a0a02ad5971ccb0bde8706b657c5743310a2 # timestamp: 2010-06-29 16:12:31 +0300 # base_revision_id: marko.makela@stripped\ # 1ilqaj51u9sj9vqe # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW9+/T0AAYrflAAwWnf/918m BAC////wBAAIAFADunbvate47M9L3nhKmkaJpP0p6YibTFP1NNTNI0AaaM1BtQJKp4owaJpjRGkw hkMgAAaAEogk9NJkNqGIjJoNMg0aNAAA2pJPQU9TE09E9EMyAJowEYjTEYSSCTJPJoZTaajyR5FP Kep6mjE0AzJCmVZWSorzeC8N2YosvwLYucBRSybM5rIuxdcBU4bxvspBikY8Lfw5fu/Lt+cj/N5O E0SIhLqtOt827Wk807e4FoDLbz7KXsrddY3iWMVhcKLORcWQFUnVfAKW7ZHIzDsqMwJwL0nrSviM 0sKKqZqoyF4PZkidQV5kw9aHIMlugvKKsVGJyNovOonH1A+lEdubqUEjs1/Rc22proicV8jcMLv3 Egl+lvLDbPd5GAzzQqu6bxNJ4MKRkdsbVer81XhFIsnFT9r88JirYh7TQnEWlcgeYUdjFbpoFbUd LW0SHQ4vqYH2kCI9ZtLCYwLSlkhWkxHAWmJEKB79JWUGvJ0xzdFp9DAN0dKNCHGgKx3wE2fHghou YIXTUWuxZyzKV1pM6OUZWMFRzLinCij8d2170NIYpcb2VIYy8mk5XMwTbqzFHkePIxNaIugwptnv lOQxyUt/U4kw7a6pMcqSkTtjnW9ahiaPYiwV5EIcSbCqqebGm540Xd7pjSpRyijRSF/SfViN1Q5T 0QheCFxCqBpc4PLi9MHXZcOLtbYpHk+U2+PJIo6jA0UxDktiR9Zap5FUF9COcyS47zUaPlwgVHAi xrYsobiJxetocjKX7zXS847DIQIk6ll5dtzGYcyRMkZpnRQbPm2ZNTo3py5CRteFU7JYtxnvNdk1 RtqGzzcegShTS7fUpj5HRLRPdbidrRbQkEDJzdAaJ7h0i5GpbWJTQyFIL1nmCmnBW5al5q6F06WZ zTUU4wxxKfWUZh1vaU59GclNSpPXfZ2se7d2dt3Fkz5AYJMKGuDmG3LAnVNp2E9vxoTReVqxPKsA 5zyu1Uw0hiYB3eMOFqctwrEwQAudpKdIoRcSjSkcA1FTuBOc0leiioRUyRQgeCRWHoeYzrM4ZH9R 1zURiXCk/MgXyKCMkHPC7o/E0IcwMsO/FkiEaWz+4N2ApgweZfVIqBwd7ixHCko1LNaZizAopkWE Svhz+phKUSW/JJwFI+s9CfkaXtTwSAY3uq2NTSqm8SeEFRiMqZKlVKMgL3qJacooyJFJplY5usz9 r6HaJ6zNNVjxmoUoUIdgVcm5V+ZRlUlEirosC1NaBrFRhy2MW2pFvvdGbyLxF/EvH/F3JFOFCQb3 79PQ --===============1434575319==--