From: Jon Olav Hauglid Date: August 23 2012 8:40am Subject: bzr push into mysql-5.6 branch (jon.hauglid:4152 to 4153) Bug#13945257 List-Archive: http://lists.mysql.com/commits/144596 X-Bug: 13945257 Message-Id: <20120823084056.23917.3104.4153@atum08.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDQxNTMgSm9uIE9sYXYgSGF1Z2xpZAkyMDEyLTA4LTIzCiAgICAgIEJ1ZyMxMzk0NTI1NyBORVcg Q09NUElMQVRJT04gRVJST1JTL1dBUk5JTkdTIFdJVEggWENPREUgNC4zLjIKICAgICAgCiAgICAg IEZvbGxvdy11cCBwYXRjaDogRml4IDMgYWRkaXRpb25hbCB3YXJuaW5ncyByZXBvcnRlZCBieSBD bGFuZyA0LjAgLyBYQ29kZSA0LjQuMQoKICAgIG1vZGlmaWVkOgogICAgICBzcWwvaXRlbV9zdWJz ZWxlY3QuY2MKICAgICAgc3FsL2xvZ19ldmVudC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Ry eC90cngwdHJ4LmNjCiA0MTUyIE1hcmtvIE3DpGtlbMOkCTIwMTItMDgtMjMKICAgICAgQnVnIzE0 NTI5NDc1IElOTk9EQi5JTk5PREJfQlVHMTM4Njc4NzEgRkFJTFMgRFVFIFRPIFFVRVJZIFJFQVAg U1VDQ0VFREVECiAgICAgIAogICAgICBBbGxvdyB0aGUgbm9uZGV0ZXJtaW5pc20gZm9yIG5vdy4g VGhpcyBuZWVkcyB0byBiZSBpbnZlc3RpZ2F0ZWQgbGF0ZXIuCgogICAgbW9kaWZpZWQ6CiAgICAg IG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzEzODY3ODcxLnJlc3VsdAogICAg ICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWcxMzg2Nzg3MS50ZXN0Cj09PSBt b2RpZmllZCBmaWxlICdzcWwvaXRlbV9zdWJzZWxlY3QuY2MnCi0tLSBhL3NxbC9pdGVtX3N1YnNl bGVjdC5jYwkyMDEyLTA4LTIxIDA2OjU4OjA1ICswMDAwCisrKyBiL3NxbC9pdGVtX3N1YnNlbGVj dC5jYwkyMDEyLTA4LTIzIDA4OjIxOjAzICswMDAwCkBAIC0xMTMxLDcgKzExMzEsNiBAQCBJdGVt X2V4aXN0c19zdWJzZWxlY3Q6Okl0ZW1fZXhpc3RzX3N1YnNlCiAgICAgIHNqX2NvbnZlcnRfcHJp b3JpdHkoMCksIGVtYmVkZGluZ19qb2luX25lc3QoTlVMTCkKIHsKICAgREJVR19FTlRFUigiSXRl bV9leGlzdHNfc3Vic2VsZWN0OjpJdGVtX2V4aXN0c19zdWJzZWxlY3QiKTsKLSAgYm9vbCB2YWxf Ym9vbCgpOwogICBpbml0KHNlbGVjdF9sZXgsIG5ldyBzZWxlY3RfZXhpc3RzX3N1YnNlbGVjdCh0 aGlzKSk7CiAgIG1heF9jb2x1bW5zPSBVSU5UX01BWDsKICAgbnVsbF92YWx1ZT0gRkFMU0U7IC8v Y2FuJ3QgYmUgTlVMTAoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9sb2dfZXZlbnQuY2MnCi0tLSBh L3NxbC9sb2dfZXZlbnQuY2MJMjAxMi0wOC0yMiAwODoyNDowNSArMDAwMAorKysgYi9zcWwvbG9n X2V2ZW50LmNjCTIwMTItMDgtMjMgMDg6MjE6MDMgKzAwMDAKQEAgLTEzMTgsNyArMTMxOCw3IEBA IExvZ19ldmVudCogTG9nX2V2ZW50OjpyZWFkX2xvZ19ldmVudChJT18KICAgTG9nX2V2ZW50ICpy ZXM9ICAwOwogI2lmbmRlZiBtYXhfYWxsb3dlZF9wYWNrZXQKICAgVEhEICp0aGQ9Y3VycmVudF90 aGQ7Ci0gIHVpbnQgbWF4X2FsbG93ZWRfcGFja2V0PSB0aGQgPyBzbGF2ZV9tYXhfYWxsb3dlZF9w YWNrZXQ6fih1bG9uZykwOworICB1aW50IG1heF9hbGxvd2VkX3BhY2tldD0gdGhkID8gc2xhdmVf bWF4X2FsbG93ZWRfcGFja2V0IDogfjBVOwogI2VuZGlmCiAKICAgdWxvbmcgY29uc3QgbWF4X3Np emU9Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHRyeC5jYycK LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHRyeC5jYwkyMDEyLTA3LTExIDAzOjU0OjIw ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguY2MJMjAxMi0wOC0yMyAw ODoyMTowMyArMDAwMApAQCAtOTkyLDcgKzk5Miw3IEBAIHRyeF9maW5hbGl6ZV9mb3JfZnRzKAog LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKiovLyoqCiBJZiByZXF1aXJlZCwgZmx1c2hlcyB0aGUgbG9nIHRvIGRpc2sg YmFzZWQgb24gdGhlIHZhbHVlIG9mCiBpbm5vZGJfZmx1c2hfbG9nX2F0X3RyeF9jb21taXQuICov Ci1zdGF0aWMgX19hdHRyaWJ1dGVfXygobm9ubnVsbCkpCitzdGF0aWMKIHZvaWQKIHRyeF9mbHVz aF9sb2dfaWZfbmVlZGVkX2xvdygKIC8qPT09PT09PT09PT09PT09PT09PT09PT09Ki8KCk5vIGJ1 bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku