From: Tatjana Azundris Nuernberg Date: October 15 2012 7:58am Subject: bzr push into mysql-trunk branch (tatjana.nuernberg:4723 to 4724) Bug#11763523 List-Archive: http://lists.mysql.com/commits/145039 X-Bug: 11763523 Message-Id: <20121015075801.17152.93859.4724@envy> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDQ3MjQgVGF0amFuYSBBenVuZHJpcyBOdWVybmJlcmcJMjAxMi0xMC0xNSBbbWVyZ2VdCiAgICAg IEJ1ZyMxMTc2MzUyMzogUExFQVNFIFdSSVRFIFBST1BFUiBEQVRFUyBUTyBUSEUgRVJST1IgTE9H CiAgICAgIAogICAgICBBZGRzIFBJRC9USUQgdG8gc29tZSBsb2dnaW5nIGZ1bmN0aW9uczsKICAg ICAgY2hhbmdlcyBkYXRlLXN0YW1wIGZyb20gWVlNTUREIHRvIElTTyBkYXRlIChZWVlZLU1NLURE KS4KICAgICAgCiAgICAgIEJhc2VkIG9uIGEgcGF0Y2ggYnkgRGF2aS4KCiAgICBtb2RpZmllZDoK ICAgICAgc3FsL2xvZy5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3V0L3V0MHV0LmNjCiA0NzIz IE1hcmtvIE3DpGtlbMOkCTIwMTItMTAtMTUgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjYg dG8gbXlzcWwtdHJ1bmsuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5j bHVkZS9kaWN0MGxvYWQuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCj09 PSBtb2RpZmllZCBmaWxlICdzcWwvbG9nLmNjJwotLS0gYS9zcWwvbG9nLmNjCTIwMTItMDktMjIg MTc6MTI6MzIgKzAwMDAKKysrIGIvc3FsL2xvZy5jYwkyMDEyLTEwLTE1IDA3OjU3OjMzICswMDAw CkBAIC0yMjgwLDEzICsyMjgwLDE0IEBAIHN0YXRpYyB2b2lkIHByaW50X2J1ZmZlcl90b19maWxl KGVudW0gbG8KICAgbG9jYWx0aW1lX3IoJnNrciwgJnRtX3RtcCk7CiAgIHN0YXJ0PSZ0bV90bXA7 CiAKLSAgZnByaW50ZihzdGRlcnIsICIlMDJkJTAyZCUwMmQgJTJkOiUwMmQ6JTAyZCBbJXNdICUu KnNcbiIsCi0gICAgICAgICAgc3RhcnQtPnRtX3llYXIgJSAxMDAsCi0gICAgICAgICAgc3RhcnQt PnRtX21vbisxLAorICBmcHJpbnRmKHN0ZGVyciwgIiVkLSUwMmQtJTAyZCAlMDJkOiUwMmQ6JTAy ZCAlbHUgWyVzXSAlLipzXG4iLAorICAgICAgICAgIHN0YXJ0LT50bV95ZWFyICsgMTkwMCwKKyAg ICAgICAgICBzdGFydC0+dG1fbW9uICsgMSwKICAgICAgICAgICBzdGFydC0+dG1fbWRheSwKICAg ICAgICAgICBzdGFydC0+dG1faG91ciwKICAgICAgICAgICBzdGFydC0+dG1fbWluLAogICAgICAg ICAgIHN0YXJ0LT50bV9zZWMsCisgICAgICAgICAgY3VycmVudF9waWQsCiAgICAgICAgICAgKGxl dmVsID09IEVSUk9SX0xFVkVMID8gIkVSUk9SIiA6IGxldmVsID09IFdBUk5JTkdfTEVWRUwgPwog ICAgICAgICAgICAiV2FybmluZyIgOiAiTm90ZSIpLAogICAgICAgICAgIChpbnQpIGxlbmd0aCwg YnVmZmVyKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3V0L3V0MHV0LmNj JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3V0L3V0MHV0LmNjCTIwMTItMTAtMTUgMDQ6NTU6MDIg KzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS91dC91dDB1dC5jYwkyMDEyLTEwLTE1IDA3OjU3 OjMzICswMDAwCkBAIC0yOCw2ICsyOCw3IEBAIENyZWF0ZWQgNS8xMS8xOTk0IEhlaWtraSBUdXVy aQogI2lmbmRlZiBVTklWX0lOTk9DSEVDS1NVTQogCiAjaW5jbHVkZSAidXQwc29ydC5oIgorI2lu Y2x1ZGUgIm9zMHRocmVhZC5oIiAvKiB0aHJlYWQtSUQgKi8KIAogI2lmZGVmIFVOSVZfTk9OSU5M CiAjaW5jbHVkZSAidXQwdXQuaWMiCkBAIC0yMTgsMTggKzIxOSwyNSBAQCB1dF9wcmludF90aW1l c3RhbXAoCiAvKj09PT09PT09PT09PT09PSovCiAJRklMRSogIGZpbGUpIC8qITwgaW46IGZpbGUg d2hlcmUgdG8gcHJpbnQgKi8KIHsKKwl1bGludCB0aHJlYWRfaWQgPSAwOworCisjaWZuZGVmIFVO SVZfSU5OT0NIRUNLU1VNCisJdGhyZWFkX2lkID0gb3NfdGhyZWFkX3BmKG9zX3RocmVhZF9nZXRf Y3Vycl9pZCgpKTsKKyNlbmRpZgorCiAjaWZkZWYgX19XSU5fXwogCVNZU1RFTVRJTUUgY2FsX3Rt OwogCiAJR2V0TG9jYWxUaW1lKCZjYWxfdG0pOwogCi0JZnByaW50ZihmaWxlLCIlMDJkJTAyZCUw MmQgJTJkOiUwMmQ6JTAyZCIsCi0JCShpbnQpIGNhbF90bS53WWVhciAlIDEwMCwKKwlmcHJpbnRm KGZpbGUsICIlZC0lMDJkLSUwMmQgJTAyZDolMDJkOiUwMmQgJWx4IiwKKwkJKGludCkgY2FsX3Rt LndZZWFyLAogCQkoaW50KSBjYWxfdG0ud01vbnRoLAogCQkoaW50KSBjYWxfdG0ud0RheSwKIAkJ KGludCkgY2FsX3RtLndIb3VyLAogCQkoaW50KSBjYWxfdG0ud01pbnV0ZSwKLQkJKGludCkgY2Fs X3RtLndTZWNvbmQpOworCQkoaW50KSBjYWxfdG0ud1NlY29uZCwKKwkJdGhyZWFkX2lkKTsKICNl bHNlCiAJc3RydWN0IHRtKiBjYWxfdG1fcHRyOwogCXRpbWVfdAkgICB0bTsKQEAgLTI0MywxMyAr MjUxLDE0IEBAIHV0X3ByaW50X3RpbWVzdGFtcCgKIAl0aW1lKCZ0bSk7CiAJY2FsX3RtX3B0ciA9 IGxvY2FsdGltZSgmdG0pOwogI2VuZGlmCi0JZnByaW50ZihmaWxlLCIlMDJkJTAyZCUwMmQgJTJk OiUwMmQ6JTAyZCIsCi0JCWNhbF90bV9wdHItPnRtX3llYXIgJSAxMDAsCisJZnByaW50ZihmaWxl LCAiJWQtJTAyZC0lMDJkICUwMmQ6JTAyZDolMDJkICVseCIsCisJCWNhbF90bV9wdHItPnRtX3ll YXIgKyAxOTAwLAogCQljYWxfdG1fcHRyLT50bV9tb24gKyAxLAogCQljYWxfdG1fcHRyLT50bV9t ZGF5LAogCQljYWxfdG1fcHRyLT50bV9ob3VyLAogCQljYWxfdG1fcHRyLT50bV9taW4sCi0JCWNh bF90bV9wdHItPnRtX3NlYyk7CisJCWNhbF90bV9wdHItPnRtX3NlYywKKwkJdGhyZWFkX2lkKTsK ICNlbmRpZgogfQogCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMp Lg==