From: marko.makela Date: February 10 2011 12:08pm Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3317) Bug#59877 List-Archive: http://lists.mysql.com/commits/131030 X-Bug: 59877 Message-Id: <201102101208.p1AAxSVW020582@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1412161814==" --===============1412161814== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMjEwMTEzMjUwLTJjenN4 eDYzMHpnbThoMDUKCiAzMzE3IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDItMTAKICAgICAgQnVnICM1 OTg3NyBXcm9uZyBidWZmZXIgcG9vbCBzZWxlY3RlZCBpbiBidWZfcmVhZF9pYnVmX21lcmdlX3Bh Z2VzKCkKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMHJlYS5j Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwcmVhLmMnCi0tLSBh L3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjByZWEuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUu Y29tLTIwMTEwMjEwMTEzMjUwLTJjenN4eDYzMHpnbThoMDUKKysrIGIvc3RvcmFnZS9pbm5vYmFz ZS9idWYvYnVmMHJlYS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjEwMTIw NzU4LWszdGU3N2V1NHNocWNzM2oKQEAgLTUzMCw3ICs1MzAsNyBAQCBidWZfcmVhZF9pYnVmX21l cmdlX3BhZ2VzKAogCQlidWZfcG9vbF90KglidWZfcG9vbDsKIAkJdWxpbnQJCXppcF9zaXplID0g ZmlsX3NwYWNlX2dldF96aXBfc2l6ZShzcGFjZV9pZHNbaV0pOwogCi0JCWJ1Zl9wb29sID0gYnVm X3Bvb2xfZ2V0KHNwYWNlX2lkc1tpXSwgc3BhY2VfdmVyc2lvbnNbaV0pOworCQlidWZfcG9vbCA9 IGJ1Zl9wb29sX2dldChzcGFjZV9pZHNbaV0sIHBhZ2Vfbm9zW2ldKTsKIAogCQl3aGlsZSAoYnVm X3Bvb2wtPm5fcGVuZF9yZWFkcwogCQkgICAgICAgPiBidWZfcG9vbC0+Y3Vycl9zaXplIC8gQlVG X1JFQURfQUhFQURfUEVORF9MSU1JVCkgewoK --===============1412161814== 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.5-innodb/ # testament_sha1: 0eec42e37dad1f895c1b6da9d408f57e6c856010 # timestamp: 2011-02-10 14:08:21 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@stripped\ # 2czsxx630zgm8h05 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQIEex8AAYrflAAwWmf//1MC AIq///9wBAAIAFADfXgAFDQDQigMT1NBpoBo0yGgaeiGgBzAAAAAAAAAABzAAAAAAAAAAA0FJ6ho 0ekGymgAADRoAAJJBDTUxMENAQnlNMUaZB4kzUGcVmV5z8BqeKIc1KgAc5imiP3MjhuGZieYu8DK t9UNSk+0X4I3Lk9HxovVa0Qw6YZgFL+ZGEEMoniWPKsVpsh0L2ETXqvRUrbLm8WntulGPst6RtWH FLZlbOl4uc057/BIZaJgCNvaJctae8WI4jJxUwyp+vYoh+y0XVXKhl0psQSkg57Tw7Ugsh8HoJ1O sL61Zq3r7mXvqjl/Kkfb55vJstlubt3doIsKRZINmWJJRzokn3MF33b7o0tUqi6Zas+WpMUO6lOa qvT4/IXMUeclFYscrE12cKKi4eaDlHBc8apH6/IseVPEOK2HRb2tH2G8k+CtFfd/WAWRVCpcZRhN xkW4qnlhs0Wd+UlWpnz01Yd2CeT3JqsRYqZRXAotFQ2V1y+khTkUTeghwTRafQydZOWrQpsWatLW MlqxdXG5q5jWwok5YNVG6DRka3lLk1LRKgpqaagvt9jM89mZqd5P4dttyz/S0SsrTM3rzfSh1x8z mV231a2RwYZU+cSCcGKiaSS2fHofRIlS1hlKygKSOxLXr10SpR+KUtqYO/wXgdDEHvtz6afhHTH3 4ry7gY1LQn2XmuS79a09MOWuDMkWJGPwLurTF/dulpNRTPU7x/n5qC4JvLvL1Ip7IW2ipzZp3kBQ yxwZaxo5osgpQNq12NM2q6bEha9nNlSCciiN8TEy+sKdu3DbHlu4wHSFWFKhvrYZMtzvlrc4qwOm uoNht3KA5o6yj/fl9ODHiRfSLJvjRZeKbeEqHCqmtxt+DVqajxeDUaElinj1ec0aqffLXCsOgcnd fQWd6aYs0vziHnmB5nFaBYFjg8ouSjqSGHTv5VQpEW9UkRFzEwOR0ZJFYSuJIUKhAECgSwKQUzbW MlkptIKwMuXADrRbWtgKkO+HimPZI7wmoOUpYhxxNeTmUCMINVhRhxFm4Kkl17KUUU85lRGIFSu+ IWURimTnbBP6vvjX/FnBie8Vq3g+sm3aZUjLgpQ3Ob1NfYTsZ4HWrLnaVhMHKMHrCwV+zekf3zpq U9S1KCrCF6cnKhWWHFRwX/F/r/4u5IpwoSAECPY+ --===============1412161814==--