From: marko.makela Date: May 5 2010 10:37am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3447) List-Archive: http://lists.mysql.com/commits/107468 Message-Id: <201005051037.o459XvXx024473@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1922661713==" --===============1922661713== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUxMDA1MDctNmtjZDJo ZjMyaHJ1eGJ2NwoKIDM0NDcgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNSBbbWVyZ2VdCiAgICAg IE1lcmdlCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VM b2cKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0t LSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMC0wNS0wNCAxMzoxNToxNyAr MDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCTIwMTAtMDUtMDUgMTA6 MDI6MTkgKzAwMDAKQEAgLTEsMyArMSw5IEBACisyMDEwLTA1LTA1CVRoZSBJbm5vREIgVGVhbQor CisJKiBoYW5kbGVyL2hhX2lubm9kYi5jYzoKKwlGaXggQnVnIzUzMTY1IFNldHRpbmcgaW5ub2Ri X2NoYW5nZV9idWZmZXJpbmc9REVGQVVMVCBwcm9kdWNlcworCWluY29ycmVjdCByZXN1bHQKKwog MjAxMC0wNS0wNAlUaGUgSW5ub0RCIFRlYW0KIAogCSogZnNwL2ZzcDBmc3AuYzoKCg== --===============1922661713== 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-innodb/ # testament_sha1: 2e6f42bc7a2b45f48026cc339ad2a75b806c5694 # timestamp: 2010-05-05 13:37:44 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # 6kcd2hf32hruxbv7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTvRVRgAAqNfgEAwW3P//382 DiC////wUAV+0AAHQAAAHMAmAmRgBGJiYTCYIaYmmBEmETJk9TTIYEBo0GgxMmEAZA1NFGNRoAGm TQAZAyBggxAxzAJgJkYARiYmEwmCGmJpgJJAgBNDQGpimaniKeQT0NBPU09RmpaPMzGr8/f/M+yW 9efl5kxux6t11Aq0wqhlva/ZM+KpZCUyjEoRNI1B86zYBOB0AwVCYIVEV3CykYxBjKOyoMbG634c k8yn5yhy84PUSuh/1wdpYYYC2xsdRgPKzC99DT4NVI8AT36DOQQHQ5V+hxPT7ciSt7cll4649ZwR p/wr1B7SgrHINRp9DmDoq25po1bBI7AXARjgG9z4ud4iKiqZDixzizo4YgkB6EowEjtJIHSByj/I 5JDkgyExOPRmiNMz0ydI7g7qDUpkE9iCGB4wIoHjkIcls7dtlhIgRJZNulfvL/2deBWwxT8fIrz0 Ga/q1oHEat5GVikTjiI85m26s1nwZCK9SC35Hln2hmnvLixQIp4voDjFEVCuYeF0jaMSeQZQUEuB Ay4FATPJbh5I3FZVCBSULcRTpE5cQHKk16J0ZTWE4VFhcfo9QueobdIQl9KqbIgiwYXzQMAcMxLR iYKWBLWOf2IyWPMtppciw0EGKDOTFRuxuc40mE6xMuRrB5daNYX4bQnCRsK1kx7JUh7wdAvNB9R4 YJqygkoLKTlJajOWFHcshTWT0Zi5PfeO0EbCMicpicUELLCZBXTM8kRHWla0zPIagpLB54B0ppg1 g28meWocqkRrVopj3Jm56GCr2uSOIyIHAjpmCD20DDod7IPj7O1mPA6x5OOIMTEHEB2BNxQyBkv7 85ZBmIAh600yJOeBRZVgdSCVvlUBCGD+yVlpIUaK6YxBm2cGesPpqJGk3kBczE4DHvBQ58Tr6xIu 4lwPF5AukcqvIhV+swhwjPWI+1SA59/8Du8wLjYQHmkcOJFJwPifvd810RMXmk9w8MS0xIZDIS3n MeTE58nkx/S9SgrOGXxHnC+IwkMfhBWJGBLZzvB2jmWoeRJBFDFKRt+CnJi4xx+RfWdlKrqOUO3W ySGmlQOd1ZjadZ0eSPGY7uaeGFKuHotTCu/NRu24GU1wXsQm8hMgarC+07sL9YFt51BmMBWzlq9X oCsIm3Stt53DuZauo5jF50NZRgGddP79vIJltOt4uJySMIUOcw5yRq6wchhMfkxDkZluF9rP0EFu WTpfAxXtTLAPZzzGU1nekRDFWGKHh6+AjN8/4FbKyrdN+/YTDzYgLTFAc9h/WWWrX3oP+3nwBtxF dqjxBYC0IVod/pwVyHguFQkMHDKqua5mc8Z0iPaJHiCy59DDMaBxnRMnm4yB7loOsKyCRMUr3kkj 6+8lMOQyS618igIpNEiPewyA5FS9YLqDYcQ6koMgYT+iFQoSDAt/AbAFQgOZFBT+hItE5EuTxXzn Yb1pLDExNqLzzkqQPwgs421VFQMSPjbnKdOla0DDwS3hbq6KYRbad464ZJ6pJNJCpRkpiwD4gzB1 pwnLeDEgYbID9MBlOtaAaSOwwkLWEwnNy7C7qcRPqRIhN9y4e4rM5Iv0g8ITBSmFQK9kSZDiDw7j WfjrJz0QcEEytmVQs2pQOwsQEAeg+4dh7i1BeWApw2ytMw4Q4cMeAj7oNhHW46u4MbB5kifEtMh/ 4u5IpwoSB3oqowA= --===============1922661713==--