# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505103733-s724cvnstmkz9w4t # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 2e6f42bc7a2b45f48026cc339ad2a75b806c5694 # timestamp: 2010-05-05 13:38:00 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20100505100219-\ # fwuux50ypjclvr8n # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS2IGfMAAyXfgGAwW3///3cn H4q////wYAZ/Hp0AVQKKABQUOMmTTTCZGQMCMTRgjCDRpgAEElJqnmqb1DU8p7RT1HlNGjTJoaAA GgAAOMmTTTCZGQMCMTRgjCDRpgAEGqn6aFDEGhoNGgAAABoAAAOMmTTTCZGQMCMTRgjCDRpgAEEk gmgBBkNE0whGjTFTbU8ppoaah4Q0cZjAcJEUDJmGYb0v8xlp1Njq2mXHpP0GcfPpPqWcbJHEnFYm FmGWlodFr4pVsBTJ7x12BRXKjNqNQxrF8cxm5EC02hqMHszJf9/gNb6Isrb9MoRB73KJsiQYNQUh ZQ5wqjfG+ikFhPM0hEgBJAxTbCAax9XUcnYJgeeocPGD7XTnT038dxAgXH95PraWttzZe4E5+RsI IDtDDqCCsPoeh9SY+QzH53Yo7iIfO8Z60po8EeyggxrNGEwMTi+o1YVkPcuBIshYbYWU2LpGZIOA gd2L1mJJg1wk53mIqKWrkk5gZhhmHGa4ecR4gIOBHJQUB8XA9JKKQXkFsHoKITDDwcYJnntPb+a0 rkp1cBXY4r9xVMnkQQ5BtGDtMTKRMoKM2iqconq0L4J7/0VtJ31LAmJ4YUqKxM5tPsUZx7ctYkVu xXmDjE00UAymLCDylyfmC2SoIC1djeiIhrM6RSgwstrIBbORWIzhlZBQQQCWBePmxIKIONDE6tU5 WPLRw+izoKR6nHOryJwkTEBp3TTLUoBQSKj7m4M5XdliHoRqWYEtrL/EwB8c5oj0YKaB0GQ/gEnK FzYiC0lHrTHDzDXVpTNqJnimsJTWU10rptClOMi4vNyD/DOMqmwENsHeQRWBQbD9SAYP2DFI5a4t QoRWRGVUEmjPeYyemtRqgZBRRzEbdUcPID7yFQclXRZqnKlOn1wZ5RUMph5voWLD6JSJFp+Amkpi FRUEXrBE1ipFPOv2Q47xhi7V5BiMkdQyHnMbUSC/UNAaC7mB7HLtZjuOQ8iOIMTEBxA3JGhcxfFM hff+wz552GBmb59f/n/BH2CtH0p+qPpQPRSjOWf0iyARCoJwnPuH/0VTohAGv3ZZkaEf0H7B5Btn nZyTAP8W82UaVMuiePSTLtIC3TaTBhsDkgt6OG+cSWPIxCKMxODRdPgkEK2py0kTBaUZ6xGwpSRc x5MeWZPPI9CYoNY40nvTg6Sg+NpkSS3oPg49/gIcOJ1rLzzXki09D3B98xiveTKQfJB+Liw4Bx9D agcMhDH4VwaRIuNCwJX3VVUhRDQahhIkNCcogd484CQnXNn64ULNadKdns7F39huHCRmKafAZ3KA 45+H6zHjUnhjzOI1xaoid4nekew41GsmDQdElqao7DxTJBcJ6P4I7xMglXMeFDt4HUGgxFEMAqVS AnCJIMVvN9q1HUP9g41IPaPDIoca1eua7bVafz29ijTQsjjFFRyPWjuitnMQ4pHd3L6G8PWakuAm OlNwGLmDoQUJkGIEXcHF5eZD9aQwROoZazUjFKItK11dYrbDYu7cQJGKAr1oCc6jWQjiutXduRmy CpdfNB9jgkG4UgRcHEsBl4TUq9Dw6gYikHC1CGDFVhRpTLoIpcx2JOigqEi7wEGcxxPkOBnDDjBF hmKC5TG4iHaqziFU5FTj1aGRJXesUvOg/mdDkRYRfevEsKEpE5IfBHUah4yvTjoOO05BVFhMyBhP 6yTCClTl1xvNwhZxg9AZCRBLzoReFfRiiFeocll3DlVpOYTicEUkVSB6JwWZe1fiobXWVgxQU2pY GzaZ9ycYSSFzMyViTTiLDuL7hknqkllwnBFSI1zVAfhHqfvmCTBJepA8XDmESIMNiH/Fv4kRyqVS AaSKzJKYOLFnAKEus0MRD2JYjEAvk/zIQJgePNgWknEhiq8osBxAHhSnOFITmsTAkYiQiDB2YEoE twkT95Yk1A4RdFWpjGTIDIHrOLyD1HgPMysWlkHlSFBcaDUVJ44Y710raRSY9wSrDeQKi0/0XckU 4UJAtiBnzA==