From: marko.makela Date: November 3 2010 9:11am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3654) Bug#57947 List-Archive: http://lists.mysql.com/commits/122615 X-Bug: 57947 Message-Id: <201011030911.oA384qng025193@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0039483142==" --===============0039483142== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzA5MDk0NS1hYzl2 Z2w3MXl2ZTN2c3N6CgogMzY1NCBNYXJrbyBNw6RrZWzDpAkyMDEwLTExLTAzCiAgICAgIFJlbW92 ZSBhIGNvbXBpbGVyIHdhcm5pbmcgdGhhdCB3YXMgdW5tYXNrZWQgYnkgdGhlIEJ1ZyAjNTc5NDcg Zml4LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0 MGNyZWEuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGlj dDBjcmVhLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwY3JlYS5jCXJl dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTAzMDkwOTQ1LWFjOXZnbDcxeXZlM3Zz c3oKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBjcmVhLmMJcmV2aWQ6bWFy a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMDMwOTExMzgtbm91M3NiYXZ1Y2Q0YmRweApAQCAt ODI4LDcgKzgyOCw3IEBAIGRpY3RfdHJ1bmNhdGVfaW5kZXhfdHJlZSgKIAlhcHByb3ByaWF0ZSBm aWVsZCBpbiB0aGUgU1lTX0lOREVYRVMgcmVjb3JkOiB0aGlzIG1pbmktdHJhbnNhY3Rpb24KIAlt YXJrcyB0aGUgQi10cmVlIHRvdGFsbHkgdHJ1bmNhdGVkICovCiAKLQlidHJfcGFnZV9nZXQoc3Bh Y2UsIHppcF9zaXplLCByb290X3BhZ2Vfbm8sIFJXX1hfTEFUQ0gsIG10cik7CisJYnRyX2Jsb2Nr X2dldChzcGFjZSwgemlwX3NpemUsIHJvb3RfcGFnZV9ubywgUldfWF9MQVRDSCwgbXRyKTsKIAog CWJ0cl9mcmVlX3Jvb3Qoc3BhY2UsIHppcF9zaXplLCByb290X3BhZ2Vfbm8sIG10cik7CiBjcmVh dGU6Cgo= --===============0039483142== 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: 2be3a9a6379fa4985c971a0dd967787f4c617443 # timestamp: 2010-11-03 11:11:48 +0200 # base_revision_id: marko.makela@stripped\ # ac9vgl71yve3vssz # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbQj6YIAAYJflAAwWmf//3tG FMC//9/wBAAIAFADZ4AURABkUFPTTaJNiYTRPQTZT1AGQyMnqZBzAATJgATCYJhDAEYAOYACZMAC YTBMIYAjABzAATJgATCYJhDAEYAEkk0yaABNNTNE1Mp6jR4U8UDJmk9TQjI6RP8+F4kmeFHXTAAH ZmNU0Kvq/HC8gRN+48W3WIEUKnTdJUu7auPfzcdxckKoMbn45idpkDWLLk7iFQ1xF0KmbDn55nzX sI/tcVgpLlVt9Hi39I7n8lake2mIhs7aoVPFYzdiQyDqTCMbFi1BQguevGLJlwMehuUZ6+9XIqZv D4REeVCDnqdvdBBzyE+d6jQ7TLdOJ2y9T7S9VhX2yKGWtxg5cBt4jftGLOnWsaZw19G80RIcyTpT aoGGbfesaxb9rL1M/bZ5/gqVOsrnNY7i6IOblkuuBIdVwv6k4CM9YSyfs9lB7/RxoqEM9Z3ddg2s H44QVBtK21V5Lszvs3ZWj6VzxUC1OuhcsiBgPL1TgrJK3CCrFNotrS5Tx306F9knlU0bbx5CJMmo QPGeriaZO0ra2vGw43RfaVldRlcn1Wosvode0+QUzEXJotOUBGhrE/y8jPtzNa24TafD43L30EfO VjDDfK36zPEcL87oT65N3323TwTIQvxtX0SFwtgZTmGMPZ2zXsBHSPaforTBI7ra5gf0Ed+WU/SC PeIj7na40Y8BePivGleB47Yi3rZhNHw27O77fD17wYvXOjpcXpw8zWS81cvUUzdfST3f05ItSMcL FAXYY62XZCyI3KKsdqPV3aaHaDzI9tQliBffr0WWRqAYQ1ncK4OOkNa6a7UXD1EWmG6K6OtkSpVw ZmQXoMJI84RKUPXpZJqqqnE2AB0tPHZJrlU0h8c+3YKEFgtasB72eM50CYCQPwFRVkEEoNzCkJiW S6nj8eQV0y/3ddPWG2IcbnnLMrTcmfqI99waJEOOoRCl6mEnySGUruPKiP5pH4CM18jvGdvywVj7 TdS6qecfxncUMTTvCZjhK8M37pQFUh7Jlv4zsIydTohQDhMvqkcwkutyvJCzUr8sM3MpyLSyf1i3 Z2MmoSXDJTojxrKLJ0ihNKd9cITplB2l3gKFWrFNGIOHSV8OlHRNJFSoME/c5TOu+JBq8TixGHCo oCS13uep3LKIrhY+nCKsrjS3sql+SzDVYCkffiGDEFZix4KiFwzNKP/Gn8f+LuSKcKEhaEfTBA== --===============0039483142==--