From: marko.makela Date: May 12 2010 10:46am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3463) Bug#53591 List-Archive: http://lists.mysql.com/commits/108103 X-Bug: 53591 Message-Id: <201005121046.o4CAkJ5E021227@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0609341702==" --===============0609341702== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTA0MjEyLWUyaDlu MW9ieGpiOHRmZzQKCiAzNDYzIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTIKICAgICAgRG9jdW1l bnQgdGhlIEJ1ZyAjNTM1OTEgZml4IGluIHRoZSBDaGFuZ2VMb2cuCgogICAgbW9kaWZpZWQ6CiAg ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKPT09IG1vZGlmaWVkIGZpbGUgJ3N0 b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdp bi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQyMTIt ZTJoOW4xb2J4amI4dGZnNAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJl dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTA0NjAzLXZmd2tneTJmZ2pxdG9o aXYKQEAgLTEsNSArMSwxMSBAQAogMjAxMC0wNS0xMglUaGUgSW5ub0RCIFRlYW0KIAorCSogaGFu ZGxlci9oYW5kbGVyMGFsdGVyLmNjOgorCUZpeCBCdWcjNTM1OTEgY3Jhc2ggd2l0aCBmYXN0IGFs dGVyIHRhYmxlIGFuZCB0ZXh0L2Jsb2IgcHJlZml4CisJcHJpbWFyeSBrZXkKKworMjAxMC0wNS0x MglUaGUgSW5ub0RCIFRlYW0KKwogCSogcm93L3JvdzBtZXJnZS5jOgogCUZpeCBCdWcjNTM0NzEg cm93X21lcmdlX2Ryb3BfdGVtcF9pbmRleGVzKCkgcmVmZXJzIGZyZWVkIG1lbW9yeSwgU0VHVnMK IAoK --===============0609341702== 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-innodb2/ # testament_sha1: 177b92a4452cd02155d036e325d55a108b76ca4a # timestamp: 2010-05-12 13:46:11 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # e2h9n1obxjb8tfg4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWenYaU8AAZzfgEAwW3P//18m BAC////wUAPh5ou1aHpdtm8NBTQ01PSnpHk9E1NPUNqDTRoDTNJhASking00NKeNKeUep6gHlD0g AaDCCUJoTRR5Ieo9ENNBoA9QAAAGSSD0g9R6jQNPUaNAAAGmgAJKBNDQhpqejSYptqHpT1NMmBGg 000nUUHTXy1/smS6U9vxyGVjCQGSHdBqxABsac2aKh3XJUPZxmYw+xxijvQOZEiv1wMVaJlc3Yta 4UDPsxLGZ8E2ngYWNA96B+PTA8tgx1rdgcvqRIlSghoDfDeOI4bvFgn04rBQIf0oIWh3kJJhnKEL FS8E+dKertIheRC2oUsu7JPpEpVUC880Mz22se8Fj2zzQBchwfQU5Og8WiIkWDTVCsjrHj9PEzm0 7KyVpmYto/ygOYkaEF0pZ56YgXGjBCRWdVvG+aFQ4em9xtdfA5SpCwfMlFxgjZxi06ubuYkPEc6p j4nphYSibChxaNC/zDQYG4tOAnKLpG4qE5tZUDRjSBadVU5QMWYaMGikVlxEmPey0bPNRtsKTomE YtIajitNURsxcpGh5nHjmvscIuvF4jGzPlpCVJCb1NaRZyHxQkEMSxaSyxNGRY2UYeb0GOfeSqQp KBOZdaQNUuSkKlickq0YXqGkkExyYy7EewXowqw67pxxlBr8mBuyOv7OmaSVoXmlEPZ7VRT30HwV No2JXncpGgLNXhai3qDXb9EDSOCYuDoMkjwjhgkbTIoXEaWEA8Eh/fp4R1DI0gpRMJxPRgJCx5Mu TIv0uTclJIOMCjqatYxMQrKTIv+Y3ObyaYccfifb2NNDmJDIJHOWcr4yM7hpQPT0xpQLeZih5UMp LichuWIlhMTpr+iRPjvO8ttMXBWMCczkv98jZmJsT1BWN9ExDKys3aHadQZjAtkoSAiFT7pHFcTh sI74F5caxpgaCxOF1ifFRLLlHFCDfijQIjDUCwEARQMySuCsQNhwUa5U4M2X9B8TppteUi5lNvLd fwJ5vNd4ReZy4KdfvzuhzAUloHpw6RWeDI5eyyFrPbFIsxrFrDUCh0/qtKJGp1IkIXCfRm5Hg2Rb 2AkbCRWj3IMoUUZWKwyZFE3bJUMnlKKriiiZjsqCIKOzIaf2HMb+2hBUFRuIJz8O5err/gJdgtoK oDlMj+pEAsXk1WxOnZeOc4tmhYFC8uV98Jnl405AYL7iWEmM29LZwLN7aqF6hOcwStMHcIjqLFRk iKtpuYPJioygLNOO+ZNZoNTM+OHBIi5rTaJY6N6JbAyaBjESgViOqSY7fU9b8eeicVlKfrE7u77w OrPoqFyqXQohtZcambBNajrE6bZgi+4a//F3JFOFCQ6dhpTw --===============0609341702==--