From: Mikael Ronstrom Date: May 13 2011 1:51pm Subject: bzr push into mysql-5.5 branch (mikael.ronstrom:3145 to 3146) List-Archive: http://lists.mysql.com/commits/137327 Message-Id: <201105131352.p4DDq6B0026249@dator6> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDMxNDYgTWlrYWVsIFJvbnN0cm9tCTIwMTEtMDUtMTMKICAgICAgUmVtb3ZlZCB2YXJpYWJsZXMg bm8gbG9uZ2VyIG5lZWRlZCBpbiBwbHVnaW5zLCBtb3ZlZCB0byBtZXRob2RzIGluc3RlYWQKCiAg ICBtb2RpZmllZDoKICAgICAgc3FsL215c3FsZC5jYwogICAgICBzcWwvbXlzcWxkLmgKIDMxNDUg TWlrYWVsIFJvbnN0csO2bQkyMDExLTA1LTEzIFttZXJnZV0KICAgICAgbWVyZ2UKCiAgICBtb2Rp ZmllZDoKICAgICAgQ01ha2VMaXN0cy50eHQKICAgICAgVkVSU0lPTgo9PT0gbW9kaWZpZWQgZmls ZSAnc3FsL215c3FsZC5jYycKLS0tIGEvc3FsL215c3FsZC5jYwlyZXZpZDptaWthZWxAZGF0b3I5 LTIwMTEwNTEzMTExOTM4LTZrbmk3d29kMWV1dHdhM3UKKysrIGIvc3FsL215c3FsZC5jYwlyZXZp ZDptaWthZWwucm9uc3Ryb21Ab3JhY2xlLmNvbS0yMDExMDUxMzEzNDYzNS1reXd5Z3ZhYzU2Y2ti YnBhCkBAIC00NDcsNyArNDQ3LDcgQEAgdWludCBsb3dlcl9jYXNlX3RhYmxlX25hbWVzOwogdWxv bmcgdGNfaGV1cmlzdGljX3JlY292ZXI9IDA7CiB1aW50IHZvbGF0aWxlIHRocmVhZF9jb3VudDsK IGludDMyIHRocmVhZF9ydW5uaW5nOwotTVlTUUxfUExVR0lOX0lNUE9SVCB1bG9uZyB0aHJlYWRf Y3JlYXRlZDsKK3Vsb25nIHRocmVhZF9jcmVhdGVkOwogdWxvbmcgYmFja19sb2csIGNvbm5lY3Rf dGltZW91dCwgY29uY3VycmVuY3ksIHNlcnZlcl9pZDsKIHVsb25nIHRhYmxlX2NhY2hlX3NpemUs IHRhYmxlX2RlZl9zaXplOwogdWxvbmcgd2hhdF90b19sb2c7CkBAIC00NzQsOCArNDc0LDcgQEAg dWxvbmcgZGVsYXllZF9pbnNlcnRfZXJyb3JzLGZsdXNoX3RpbWU7CiB1bG9uZyBzcGVjaWFsZmxh Zz0wOwogdWxvbmcgYmlubG9nX2NhY2hlX3VzZT0gMCwgYmlubG9nX2NhY2hlX2Rpc2tfdXNlPSAw OwogdWxvbmcgYmlubG9nX3N0bXRfY2FjaGVfdXNlPSAwLCBiaW5sb2dfc3RtdF9jYWNoZV9kaXNr X3VzZT0gMDsKLU1ZU1FMX1BMVUdJTl9JTVBPUlQgdWxvbmcgbWF4X2Nvbm5lY3Rpb25zOwotdWxv bmcgbWF4X2Nvbm5lY3RfZXJyb3JzOwordWxvbmcgbWF4X2Nvbm5lY3Rpb25zLCBtYXhfY29ubmVj dF9lcnJvcnM7CiAvKgogICBNYXhpbXVtIGxlbmd0aCBvZiBwYXJhbWV0ZXIgdmFsdWUgd2hpY2gg Y2FuIGJlIHNldCB0aHJvdWdoCiAgIG15c3FsX3NlbmRfbG9uZ19kYXRhKCkgY2FsbC4KQEAgLTU4 Myw3ICs1ODIsNyBAQCBMZV9jcmVhdG9yIGxlX2NyZWF0b3I7CiBNWVNRTF9GSUxFICpib290c3Ry YXBfZmlsZTsKIGludCBib290c3RyYXBfZXJyb3I7CiAKLU1ZU1FMX1BMVUdJTl9JTVBPUlQgSV9M aXN0PFRIRD4gdGhyZWFkczsKK0lfTGlzdDxUSEQ+IHRocmVhZHM7CiBScGxfZmlsdGVyKiBycGxf ZmlsdGVyOwogUnBsX2ZpbHRlciogYmlubG9nX2ZpbHRlcjsKIApAQCAtNjMyLDkgKzYzMSw5IEBA IG15c3FsX211dGV4X3QgTE9DS19kZXNfa2V5X2ZpbGU7CiAjZW5kaWYKIG15c3FsX3J3bG9ja190 IExPQ0tfZ3JhbnQsIExPQ0tfc3lzX2luaXRfY29ubmVjdCwgTE9DS19zeXNfaW5pdF9zbGF2ZTsK IG15c3FsX3J3bG9ja190IExPQ0tfc3lzdGVtX3ZhcmlhYmxlc19oYXNoOwotTVlTUUxfUExVR0lO X0lNUE9SVCBteXNxbF9jb25kX3QgQ09ORF90aHJlYWRfY291bnQ7CitteXNxbF9jb25kX3QgQ09O RF90aHJlYWRfY291bnQ7CiBwdGhyZWFkX3Qgc2lnbmFsX3RocmVhZDsKLU1ZU1FMX1BMVUdJTl9J TVBPUlQgcHRocmVhZF9hdHRyX3QgY29ubmVjdGlvbl9hdHRyaWI7CitwdGhyZWFkX2F0dHJfdCBj b25uZWN0aW9uX2F0dHJpYjsKIG15c3FsX211dGV4X3QgTE9DS19zZXJ2ZXJfc3RhcnRlZDsKIG15 c3FsX2NvbmRfdCBDT05EX3NlcnZlcl9zdGFydGVkOwogCkBAIC03ODcxLDkgKzc4NzAsNyBAQCBz dGF0aWMgUFNJX2NvbmRfaW5mbyBhbGxfc2VydmVyX2NvbmRzW109CiAKIFBTSV90aHJlYWRfa2V5 IGtleV90aHJlYWRfYm9vdHN0cmFwLCBrZXlfdGhyZWFkX2RlbGF5ZWRfaW5zZXJ0LAogICBrZXlf dGhyZWFkX2hhbmRsZV9tYW5hZ2VyLCBrZXlfdGhyZWFkX21haW4sCi0gIGtleV90aHJlYWRfc2ln bmFsX2hhbmQ7Ci0KLU1ZU1FMX1BMVUdJTl9JTVBPUlQgUFNJX3RocmVhZF9rZXkga2V5X3RocmVh ZF9vbmVfY29ubmVjdGlvbjsKKyAga2V5X3RocmVhZF9vbmVfY29ubmVjdGlvbiwga2V5X3RocmVh ZF9zaWduYWxfaGFuZDsKIAogc3RhdGljIFBTSV90aHJlYWRfaW5mbyBhbGxfc2VydmVyX3RocmVh ZHNbXT0KIHsKCj09PSBtb2RpZmllZCBmaWxlICdzcWwvbXlzcWxkLmgnCi0tLSBhL3NxbC9teXNx bGQuaAlyZXZpZDptaWthZWxAZGF0b3I5LTIwMTEwNTEzMTExOTM4LTZrbmk3d29kMWV1dHdhM3UK KysrIGIvc3FsL215c3FsZC5oCXJldmlkOm1pa2FlbC5yb25zdHJvbUBvcmFjbGUuY29tLTIwMTEw NTEzMTM0NjM1LWt5d3lndmFjNTZja2JicGEKQEAgLTIwNiwxMiArMjA2LDEyIEBAIGV4dGVybiBz dHJ1Y3QgbXlfb3B0aW9uIG15X2xvbmdfb3B0aW9uc1sKIGV4dGVybiBpbnQgbXlzcWxkX3NlcnZl cl9zdGFydGVkOwogZXh0ZXJuICJDIiBNWVNRTF9QTFVHSU5fSU1QT1JUIGludCBvcmlnX2FyZ2M7 CiBleHRlcm4gIkMiIE1ZU1FMX1BMVUdJTl9JTVBPUlQgY2hhciAqKm9yaWdfYXJndjsKLWV4dGVy biBNWVNRTF9QTFVHSU5fSU1QT1JUIHB0aHJlYWRfYXR0cl90IGNvbm5lY3Rpb25fYXR0cmliOwor ZXh0ZXJuIHB0aHJlYWRfYXR0cl90IGNvbm5lY3Rpb25fYXR0cmliOwogZXh0ZXJuIE1ZU1FMX0ZJ TEUgKmJvb3RzdHJhcF9maWxlOwogZXh0ZXJuIG15X2Jvb2wgb2xkX21vZGU7CiBleHRlcm4gTEVY X1NUUklORyBvcHRfaW5pdF9jb25uZWN0LCBvcHRfaW5pdF9zbGF2ZTsKIGV4dGVybiBpbnQgYm9v dHN0cmFwX2Vycm9yOwotZXh0ZXJuIE1ZU1FMX1BMVUdJTl9JTVBPUlQgSV9MaXN0PFRIRD4gdGhy ZWFkczsKK2V4dGVybiBJX0xpc3Q8VEhEPiB0aHJlYWRzOwogZXh0ZXJuIGNoYXIgZXJyX3NoYXJl ZF9kaXJbXTsKIGV4dGVybiBUWVBFTElCIHRocmVhZF9oYW5kbGluZ190eXBlbGliOwogZXh0ZXJu IG15X2RlY2ltYWwgZGVjaW1hbF96ZXJvOwpAQCAtMjY3LDkgKzI2Nyw3IEBAIGV4dGVybiBQU0lf Y29uZF9rZXkga2V5X1JFTEFZTE9HX3VwZGF0ZV8KIAogZXh0ZXJuIFBTSV90aHJlYWRfa2V5IGtl eV90aHJlYWRfYm9vdHN0cmFwLCBrZXlfdGhyZWFkX2RlbGF5ZWRfaW5zZXJ0LAogICBrZXlfdGhy ZWFkX2hhbmRsZV9tYW5hZ2VyLCBrZXlfdGhyZWFkX2tpbGxfc2VydmVyLCBrZXlfdGhyZWFkX21h aW4sCi0gIGtleV90aHJlYWRfc2lnbmFsX2hhbmQ7Ci0KLWV4dGVybiBNWVNRTF9QTFVHSU5fSU1Q T1JUIFBTSV90aHJlYWRfa2V5IGtleV90aHJlYWRfb25lX2Nvbm5lY3Rpb247CisgIGtleV90aHJl YWRfb25lX2Nvbm5lY3Rpb24sIGtleV90aHJlYWRfc2lnbmFsX2hhbmQ7CiAKICNpZmRlZiBIQVZF X01NQVAKIGV4dGVybiBQU0lfZmlsZV9rZXkga2V5X2ZpbGVfbWFwOwpAQCAtMzQyLDcgKzM0MCw3 IEBAIGV4dGVybiBteXNxbF9tdXRleF90IExPQ0tfc2VydmVyX3N0YXJ0ZWQKIGV4dGVybiBteXNx bF9jb25kX3QgQ09ORF9zZXJ2ZXJfc3RhcnRlZDsKIGV4dGVybiBteXNxbF9yd2xvY2tfdCBMT0NL X2dyYW50LCBMT0NLX3N5c19pbml0X2Nvbm5lY3QsIExPQ0tfc3lzX2luaXRfc2xhdmU7CiBleHRl cm4gbXlzcWxfcndsb2NrX3QgTE9DS19zeXN0ZW1fdmFyaWFibGVzX2hhc2g7Ci1leHRlcm4gTVlT UUxfUExVR0lOX0lNUE9SVCBteXNxbF9jb25kX3QgQ09ORF90aHJlYWRfY291bnQ7CitleHRlcm4g bXlzcWxfY29uZF90IENPTkRfdGhyZWFkX2NvdW50OwogZXh0ZXJuIG15c3FsX2NvbmRfdCBDT05E X21hbmFnZXI7CiBleHRlcm4gaW50MzIgdGhyZWFkX3J1bm5pbmc7CiBleHRlcm4gbXlfYXRvbWlj X3J3bG9ja190IHRocmVhZF9ydW5uaW5nX2xvY2s7CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVz cyBmb3IgcHVzaCBlbWFpbHMpLg==