From: marko.makela
Date: January 16 2012 12:34pm
Subject: bzr push into mysql-5.1 branch (marko.makela:3668 to 3669) Bug#13496818
List-Archive: http://lists.mysql.com/commits/142410
X-Bug: 13496818
Message-Id: <201201161234.q0GCYM5m020780@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2NjkgTWFya28gTcOka2Vsw6QJMjAxMi0wMS0xNgogICAgICBCdWcjMTM0OTY4MTggQVNTRVJU
SU9OOiBSRUNfUEFHRV9OTyA+IDQgSU4gSUJVRiBDT05UUkFDVElPTgogICAgICBSZWxheCBhIGJv
Z3VzIGRlYnVnIGFzc2VydGlvbi4KICAgICAgQXBwcm92ZWQgYnkgSmltbXkgWWFuZyBvbiBJTS4K
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2lidWYvaWJ1ZjBpYnVmLmMKIDM2NjggTnVubyBDYXJ2YWxobwkyMDEyLTAxLTE2CiAg
ICAgIEJVRyMxMTg5MzI4OCA2MDU0MjogUlBMLlJQTF9FWFRSQV9DT0xfTUFTVEVSXyogRE9FU04n
VCBURVNUIFdIQVQgV0FTIElOVEVOREVECiAgICAgIAogICAgICBUZXN0IGV4dHJhL3JwbF90ZXN0
cy9ycGxfZXh0cmFfY29sX21hc3Rlci50ZXN0ICh1c2VkIGJ5CiAgICAgIHJwbF9leHRyYV9jb2xf
bWFzdGVyXyopIGVuZHMgd2l0aCB0aGUgYWN0aXZlIGNvbm5lY3Rpb24gcG9pbnRpbmcgdG8gdGhl
CiAgICAgIHNsYXZlLiBUaHVzLCB0aGUgdHdvIGxhc3QgdGVzdHMgbmV2ZXIgc3VjY2VlZCBpbiBj
aGFuZ2luZyB0aGUgYmlubG9nCiAgICAgIGZvcm1hdCBvZiB0aGUgbWFzdGVyIGF3YXkgZnJvbSAn
cm93Jy4gV2l0aCBjb3JyZWN0IGFjdGl2ZSBjb25uZWN0aW9uCiAgICAgIChtYXN0ZXIpIHRlc3Rz
IGZhaWwgZm9yIGJpbmxvZyAnc3RhdGVtZW50JyBhbmQgJ21peGVkJyBmb3JtYXRzLgogICAgICAK
ICAgICAgVGVzdHMgcnBsX2V4dHJhX2NvbF9tYXN0ZXJfKiBvbmx5IHJ1biB3aGVuIGJpbmFyeSBs
b2cgZm9ybWF0IGlzCiAgICAgIHJvdy4gIFN0YXRlbWVudCBhbmQgbWl4IHJlcGxpY2F0aW9uIGRv
IG5vdCBtYWtlIHNlbnNlIGluIHRoaXMKICAgICAgdGVzdHMgc2luY2UgaXQgd2lsbCB0cnkgdG8g
ZXhlY3V0ZSBzdGF0ZW1lbnRzIG9uIGNvbHVtbnMgdGhhdCBkbwogICAgICBub3QgZXhpc3QuICBU
aGlzIGZpeCBpcyBiYXNpY2FsbHkgYSBiYWNrcG9ydCBmcm9tIG15c3FsLTUuNSwgc2VlCiAgICAg
IGNoYW5nZXMgZG9uZSBhcyBwYXJ0IG9mIEJVRyAzOTkzNC4KCiAgICBtb2RpZmllZDoKICAgICAg
bXlzcWwtdGVzdC9leHRyYS9ycGxfdGVzdHMvcnBsX2V4dHJhX2NvbF9tYXN0ZXIudGVzdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9leHRyYV9jb2xfbWFzdGVyX2lubm9kYi5yZXN1
bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfZXh0cmFfY29sX21hc3Rlcl9teWlz
YW0ucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvcnBsX2V4dHJhX2NvbF9tYXN0
ZXJfaW5ub2RiLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxfZXh0cmFfY29s
X21hc3Rlcl9teWlzYW0udGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9p
YnVmL2lidWYwaWJ1Zi5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMJ
cmV2aWQ6bnVuby5jYXJ2YWxob0BvcmFjbGUuY29tLTIwMTIwMTE2MDkxNzQwLWc5bWFpcmR4cW00
aTUybXoKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwMTE2MTIyMjAzLWl3bjR2ZDdkbjVhenlleHIKQEAgLTIw
MDksNyArMjAwOSwxNSBAQCBpYnVmX2dldF9tZXJnZV9wYWdlX25vcygKIAkJfSBlbHNlIHsKIAkJ
CXJlY19wYWdlX25vID0gaWJ1Zl9yZWNfZ2V0X3BhZ2Vfbm8ocmVjKTsKIAkJCXJlY19zcGFjZV9p
ZCA9IGlidWZfcmVjX2dldF9zcGFjZShyZWMpOwotCQkJdXRfYWQocmVjX3BhZ2Vfbm8gPiBJQlVG
X1RSRUVfUk9PVF9QQUdFX05PKTsKKwkJCS8qIEluIHRoZSBzeXN0ZW0gdGFibGVzcGFjZSwgdGhl
IHNtYWxsZXN0CisJCQlwb3NzaWJsZSBzZWNvbmRhcnkgaW5kZXggbGVhZiBwYWdlIG51bWJlciBp
cworCQkJYmlnZ2VyIHRoYW4gSUJVRl9UUkVFX1JPT1RfUEFHRV9OTyAoNCkuIEluCisJCQlvdGhl
ciB0YWJsZXNwYWNlcywgdGhlIGNsdXN0ZXJlZCBpbmRleCB0cmVlIGlzCisJCQljcmVhdGVkIGF0
IHBhZ2UgMywgd2hpY2ggbWFrZXMgcGFnZSA0IHRoZQorCQkJc21hbGxlc3QgcG9zc2libGUgc2Vj
b25kYXJ5IGluZGV4IGxlYWYgcGFnZQorCQkJKGFuZCB0aGF0IG9ubHkgYWZ0ZXIgRFJPUCBJTkRF
WCkuICovCisJCQl1dF9hZChyZWNfcGFnZV9ubworCQkJICAgICAgPiBJQlVGX1RSRUVfUk9PVF9Q
QUdFX05PIC0gKHJlY19zcGFjZV9pZCAhPSAwKSk7CiAJCX0KIAogI2lmZGVmIFVOSVZfSUJVRl9E
RUJVRwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bnVuby5jYXJ2YWxo
b0BvcmFjbGUuY29tLTIwMTIwMTE2MDkxNzQwLWc5bWFpcmR4cW00aTUybXoKKysrIGIvc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEyMDExNjEyMjIwMy1pd240dmQ3ZG41YXp5ZXhyCkBAIC0xLDcgKzEsMTIgQEAKIDIwMTItMDEt
MTYJVGhlIElubm9EQiBUZWFtCiAKKwkqIGlidWYvaWJ1ZjBpYnVmLmM6CisJRml4IEJ1ZyMxMzQ5
NjgxOCBBU1NFUlRJT046IFJFQ19QQUdFX05PID4gNCBJTiBJQlVGIENPTlRSQUNUSU9OCisKKzIw
MTItMDEtMTYJVGhlIElubm9EQiBUZWFtCisKIAkqIGhhbmRsZXIvaGFfaW5ub2RiLmNjOgotCUZp
eCBCdWcjMTE3NjU0Mzg6IDU4NDA2OiBJU1NVRVMgV0lUSCBDT1BZSU5HIFBBUlRJVElPTkVEIElO
Tk9EQiAKKwlGaXggQnVnIzExNzY1NDM4OiA1ODQwNjogSVNTVUVTIFdJVEggQ09QWUlORyBQQVJU
SVRJT05FRCBJTk5PREIKIAlUQUJMRVMgRlJPTSBMSU5VWCBUTyBXSU5ET1dTCiAKIDIwMTItMDEt
MDQJVGhlIElubm9EQiBUZWFtCkBAIC0xNyw4ICsyMiw4IEBACiAyMDExLTEyLTEzCVRoZSBJbm5v
REIgVGVhbQogCiAJKiBoYW5kbGVyL2hhX2lubm9kYi5jYywgaW5ub2RiLnRlc3QsIGlubm9kYi5y
ZXN1bHQ6Ci0JRml4IEJ1ZyMxMzExNzAyMzogSW5ub0RCIHdhcyBpbmNyZW1lbnRpbmcgdGhlIGhh
bmRsZXJfcmVhZF9rZXksIAotCWFsc28gdGhlIFNTVjo6aGFfcmVhZF9rZXlfY291bnQsIGF0IHRo
ZSB3cm9uZyBwbGFjZS4gICAKKwlGaXggQnVnIzEzMTE3MDIzOiBJbm5vREIgd2FzIGluY3JlbWVu
dGluZyB0aGUgaGFuZGxlcl9yZWFkX2tleSwKKwlhbHNvIHRoZSBTU1Y6OmhhX3JlYWRfa2V5X2Nv
dW50LCBhdCB0aGUgd3JvbmcgcGxhY2UuCiAKIDIwMTEtMTItMTAJVGhlIElubm9EQiBUZWFtCiAK
QEAgLTI3OSw3ICsyODQsNyBAQAogCiAyMDExLTAxLTA2CVRoZSBJbm5vREIgVGVhbQogCSogZGlj
dC9kaWN0MGRpY3QuYywgaGFuZGxlci9oYV9pbm5vZGIuY2MsIGhhbmRsZXIvaV9zLmNjLAotCWlu
Y2x1ZGUvdW5pdi5pOiAKKwlpbmNsdWRlL3VuaXYuaToKIAlGaXggQnVnIzU4NjQzIElubm9EQjog
dG9vIGxvbmcgdGFibGUgbmFtZQogCiAyMDExLTAxLTA2CVRoZSBJbm5vREIgVGVhbQpAQCAtNTQ1
LDcgKzU1MCw3IEBACiAKIAkqIGhhbmRsZXIvaGFfaW5ub2RiLmNjLCBpbmNsdWRlL3JvdzBteXNx
bC5oLCByb3cvcm93MG15c3FsLmM6CiAJRml4IEJ1ZyM1MzU5MjogY3Jhc2ggcmVwbGFjaW5nIGR1
cGxpY2F0ZXMgaW50byB0YWJsZSBhZnRlciBmYXN0Ci0JYWx0ZXIgdGFibGUgYWRkZWQgdW5pcXVl
IGtleSAKKwlhbHRlciB0YWJsZSBhZGRlZCB1bmlxdWUga2V5CiAKIDIwMTAtMDUtMjQJVGhlIElu
bm9EQiBUZWFtCiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaWJ1
Zi9pYnVmMGlidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2lidWYvaWJ1ZjBpYnVm
LmMJcmV2aWQ6bnVuby5jYXJ2YWxob0BvcmFjbGUuY29tLTIwMTIwMTE2MDkxNzQwLWc5bWFpcmR4
cW00aTUybXoKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2lidWYvaWJ1ZjBpYnVmLmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjAxMTYxMjIyMDMtaXduNHZkN2RuNWF6eWV4
cgpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogCi1Db3B5cmlnaHQgKGMp
IDE5OTcsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVz
ZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTcsIDIwMTIsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmls
aWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3
YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0IHVuZGVyCiB0aGUg
dGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0
aGUgRnJlZSBTb2Z0d2FyZQpAQCAtMjA5MCw3ICsyMDkwLDE1IEBAIGlidWZfZ2V0X21lcmdlX3Bh
Z2Vfbm9zKAogCQl9IGVsc2UgewogCQkJcmVjX3BhZ2Vfbm8gPSBpYnVmX3JlY19nZXRfcGFnZV9u
byhyZWMpOwogCQkJcmVjX3NwYWNlX2lkID0gaWJ1Zl9yZWNfZ2V0X3NwYWNlKHJlYyk7Ci0JCQl1
dF9hZChyZWNfcGFnZV9ubyA+IElCVUZfVFJFRV9ST09UX1BBR0VfTk8pOworCQkJLyogSW4gdGhl
IHN5c3RlbSB0YWJsZXNwYWNlLCB0aGUgc21hbGxlc3QKKwkJCXBvc3NpYmxlIHNlY29uZGFyeSBp
bmRleCBsZWFmIHBhZ2UgbnVtYmVyIGlzCisJCQliaWdnZXIgdGhhbiBJQlVGX1RSRUVfUk9PVF9Q
QUdFX05PICg0KS4gSW4KKwkJCW90aGVyIHRhYmxlc3BhY2VzLCB0aGUgY2x1c3RlcmVkIGluZGV4
IHRyZWUgaXMKKwkJCWNyZWF0ZWQgYXQgcGFnZSAzLCB3aGljaCBtYWtlcyBwYWdlIDQgdGhlCisJ
CQlzbWFsbGVzdCBwb3NzaWJsZSBzZWNvbmRhcnkgaW5kZXggbGVhZiBwYWdlCisJCQkoYW5kIHRo
YXQgb25seSBhZnRlciBEUk9QIElOREVYKS4gKi8KKwkJCXV0X2FkKHJlY19wYWdlX25vCisJCQkg
ICAgICA+IElCVUZfVFJFRV9ST09UX1BBR0VfTk8gLSAocmVjX3NwYWNlX2lkICE9IDApKTsKIAkJ
fQogCiAjaWZkZWYgVU5JVl9JQlVGX0RFQlVHCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBm
b3IgcHVzaCBlbWFpbHMpLg==