From: Tor Didriksen
Date: November 8 2011 2:34pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3575 to 3576) WL#5825
List-Archive: http://lists.mysql.com/commits/141858
Message-Id: <201111081434.pA8EYBDP013248@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM1NzYgVG9yIERpZHJpa3NlbgkyMDExLTExLTA4CiAgICAgIFdMIzU4MjUgVXNpbmcgQysrIFN0
YW5kYXJkIExpYnJhcnkgd2l0aCBNeVNRTCBjb2RlCiAgICAgIAogICAgICBQb3N0LXB1c2ggZml4
OiBzY3JpcHRzL215c3FsX2NvbmZpZyogbXVzdCBkaXN0aW5ndWlzaCBiZXR3ZWVuIGNmbGFncyBh
bmQgY3h4ZmxhZ3MuCgogICAgbW9kaWZpZWQ6CiAgICAgIGNvbmZpZ3VyZS5jbWFrZQogICAgICBz
Y3JpcHRzL215c3FsX2NvbmZpZy5wbC5pbgogICAgICBzY3JpcHRzL215c3FsX2NvbmZpZy5zaAog
MzU3NSBNYXJrbyBNw6RrZWzDpAkyMDExLTExLTA4IFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwt
NS41IHRvIG15c3FsLXRydW5rLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2J0ci9idHIwcGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwcGN1ci5o
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwcGN1ci5pYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnY29uZmlndXJlLmNtYWtlJwotLS0gYS9jb25maWd1cmUuY21ha2UJMjAxMS0xMS0wNyAx
MjoxNzoyNCArMDAwMAorKysgYi9jb25maWd1cmUuY21ha2UJMjAxMS0xMS0wOCAxNDozMzo0MSAr
MDAwMApAQCAtMTEwLDYgKzExMCw5IEBAIElGKENNQUtFX1NZU1RFTV9OQU1FIE1BVENIRVMgIlN1
bk9TIiBBTkQKICAgICAgICAgICAgIERFU1RJTkFUSU9OICR7SU5TVEFMTF9MSUJESVJ9IENPTVBP
TkVOVCBEZXZlbG9wbWVudCkKICAgICAjIFVzaW5nIHRoZSAkT1JJR0lOIHRva2VuIHdpdGggdGhl
IC1SIG9wdGlvbiB0byBsb2NhdGUgdGhlIGxpYnJhcmllcwogICAgICMgb24gYSBwYXRoIHJlbGF0
aXZlIHRvIHRoZSBleGVjdXRhYmxlOgorICAgICMgV2UgbmVlZCBhbiBleHRyYSBiYWNrc2xhc2gg
dG8gcGFzcyAkT1JJR0lOIHRvIHRoZSBteXNxbF9jb25maWcgc2NyaXB0Li4uCisgICAgU0VUKFFV
T1RFRF9DTUFLRV9DWFhfTElOS19GTEFHUworICAgICAgIiR7Q01BS0VfQ1hYX0xJTktfRkxBR1N9
IC1SJ1xcJE9SSUdJTi8uLi9saWInIC1SJHtTVExQT1JUX1BBVEh9IikKICAgICBTRVQoQ01BS0Vf
Q1hYX0xJTktfRkxBR1MKICAgICAgICIke0NNQUtFX0NYWF9MSU5LX0ZMQUdTfSAtUidcJE9SSUdJ
Ti8uLi9saWInIC1SJHtTVExQT1JUX1BBVEh9IikKICAgICBNRVNTQUdFKFNUQVRVUyAiQ01BS0Vf
Q1hYX0xJTktfRkxBR1MgJHtDTUFLRV9DWFhfTElOS19GTEFHU30iKQoKPT09IG1vZGlmaWVkIGZp
bGUgJ3NjcmlwdHMvbXlzcWxfY29uZmlnLnBsLmluJwotLS0gYS9zY3JpcHRzL215c3FsX2NvbmZp
Zy5wbC5pbgkyMDExLTA2LTMwIDE1OjUwOjQ1ICswMDAwCisrKyBiL3NjcmlwdHMvbXlzcWxfY29u
ZmlnLnBsLmluCTIwMTEtMTEtMDggMTQ6MzM6NDEgKzAwMDAKQEAgLTQ0LDcgKzQ0LDYgQEAgdXNl
IHN0cmljdDsKIG15IEBleGNsdWRlX2NmbGFncyA9CiAgIHF3L0REQlVHX09GRiBEU0FGRV9NVVRF
WCBERk9SQ0VfSU5JVF9PRl9WQVJTCiAgICAgIERFWFRSQV9ERUJVRyBESEFWRV9wdXJpZnkgTyBP
WzAtOV0geE9bMC05XSBXWy1BLVphLXpdKgotICAgICBYYSB4c3RyY29uc3QgeGM5OT1ub25lCiAg
ICAgIHVucm9sbDIgaXAgbXAgcmVzdHJpY3QvOwogCiBteSBAZXhjbHVkZV9saWJzID0gcXcvbG10
bWFsbG9jIHN0YXRpYy1saWJjeGEgaS1zdGF0aWMgc3RhdGljLWludGVsLzsKQEAgLTIwNSwxMSAr
MjA0LDEwIEBAICRmbGFncy0+e2VtYmVkZGVkX2xpYnN9ID0KIAogJGZsYWdzLT57aW5jbHVkZX0g
PSBbIi1JJHBrZ2luY2x1ZGVkaXIiXTsKICRmbGFncy0+e2NmbGFnc30gID0gW0B7JGZsYWdzLT57
aW5jbHVkZX19LHNwbGl0KCIgIiwnQENGTEFHU0AnKV07CiskZmxhZ3MtPntjeHhmbGFnc309IFtA
eyRmbGFncy0+e2luY2x1ZGV9fSxzcGxpdCgiICIsJ0BDWFhGTEFHU0AnKV07CiAKICMgLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLQogIyBSZW1vdmUgc29tZSBvcHRpb25zIHRoYXQgYSBjbGllbnQgZG9lc24ndCBoYXZl
IHRvIGNhcmUgYWJvdXQKLSMgRklYTUUgdW50aWwgd2UgaGF2ZSBhIC0tY3h4ZmxhZ3MsIHdlIG5l
ZWQgdG8gcmVtb3ZlIC1YYQotIyAgICAgICBhbmQgLXhzdHJjb25zdCB0byBtYWtlIC0tY2ZsYWdz
IHVzYWJsZSBmb3IgU3VuIEZvcnRlIEMrKwogIyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIG15ICRmaWx0ZXIg
PSBqb2luKCJ8IiwgQGV4Y2x1ZGVfY2ZsYWdzKTsKQEAgLTIxOSw2ICsyMTcsMTIgQEAgZm9yZWFj
aCBteSAkY2ZsYWcgKCBAdG1wICkKIHsKICAgcHVzaChAeyRmbGFncy0+e2NmbGFnc319LCAkY2Zs
YWcpIHVubGVzcyAkY2ZsYWcgPX4gbS9eKCRmaWx0ZXIpJC9vOwogfQorQHRtcCA9IEB7JGZsYWdz
LT57Y3h4ZmxhZ3N9fTsgICAgICAgICAgICMgQ29weSB0aGUgZmxhZyBsaXN0CiskZmxhZ3MtPntj
eHhmbGFnc30gPSBbXTsgICAgICAgICAgICAgICAgIyBDbGVhciBpdAorZm9yZWFjaCBteSAkY3h4
ZmxhZyAoIEB0bXAgKQoreworICBwdXNoKEB7JGZsYWdzLT57Y3h4ZmxhZ3N9fSwgJGN4eGZsYWcp
IHVubGVzcyAkY3h4ZmxhZyA9fiBtL14oJGZpbHRlcikkL287Cit9CiAKICMgU2FtZSBmb3IgLS1s
aWJzKF9yKQogJGZpbHRlciA9IGpvaW4oInwiLCBAZXhjbHVkZV9saWJzKTsKQEAgLTIzNCw2ICsy
MzgsNyBAQCBmb3JlYWNoIG15ICRsaWJfdHlwZSAoICJsaWJzIiwibGlic19yIiwiCiAKIG15ICRp
bmNsdWRlID0gICAgICAgcXVvdGVfb3B0aW9ucyhAeyRmbGFncy0+e2luY2x1ZGV9fSk7CiBteSAk
Y2ZsYWdzICA9ICAgICAgIHF1b3RlX29wdGlvbnMoQHskZmxhZ3MtPntjZmxhZ3N9fSk7CitteSAk
Y3h4ZmxhZ3M9ICAgICAgIHF1b3RlX29wdGlvbnMoQHskZmxhZ3MtPntjeHhmbGFnc319KTsKIG15
ICRsaWJzICAgID0gICAgICAgcXVvdGVfb3B0aW9ucyhAeyRmbGFncy0+e2xpYnN9fSk7CiBteSAk
bGlic19yICA9ICAgICAgIHF1b3RlX29wdGlvbnMoQHskZmxhZ3MtPntsaWJzX3J9fSk7CiBteSAk
ZW1iZWRkZWRfbGlicyA9IHF1b3RlX29wdGlvbnMoQHskZmxhZ3MtPntlbWJlZGRlZF9saWJzfX0p
OwpAQCAtMjUwLDYgKzI1NSw3IEBAIHN1YiB1c2FnZQogVXNhZ2U6ICQwIFtPUFRJT05TXQogT3B0
aW9uczoKICAgICAgICAgLS1jZmxhZ3MgICAgICAgICBbJGNmbGFnc10KKyAgICAgICAgLS1jeHhm
bGFncyAgICAgICBbJGN4eGZsYWdzXQogICAgICAgICAtLWluY2x1ZGUgICAgICAgIFskaW5jbHVk
ZV0KICAgICAgICAgLS1saWJzICAgICAgICAgICBbJGxpYnNdCiAgICAgICAgIC0tbGlic19yICAg
ICAgICAgWyRsaWJzX3JdCkBAIC0yNzEsNiArMjc3LDcgQEAgRU9GCiAKIEdldE9wdGlvbnMoCiAg
ICAgICAgICAgICJjZmxhZ3MiICA9PiBzdWIgeyBwcmludCAiJGNmbGFnc1xuIiB9LAorICAgICAg
ICAgICAiY3h4ZmxhZ3MiPT4gc3ViIHsgcHJpbnQgIiRjeHhmbGFnc1xuIiB9LAogICAgICAgICAg
ICAiaW5jbHVkZSIgPT4gc3ViIHsgcHJpbnQgIiRpbmNsdWRlXG4iIH0sCiAgICAgICAgICAgICJs
aWJzIiAgICA9PiBzdWIgeyBwcmludCAiJGxpYnNcbiIgfSwKICAgICAgICAgICAgImxpYnNfciIg
ID0+IHN1YiB7IHByaW50ICIkbGlic19yXG4iIH0sCgo9PT0gbW9kaWZpZWQgZmlsZSAnc2NyaXB0
cy9teXNxbF9jb25maWcuc2gnCi0tLSBhL3NjcmlwdHMvbXlzcWxfY29uZmlnLnNoCTIwMTEtMDYt
MzAgMTU6NTA6NDUgKzAwMDAKKysrIGIvc2NyaXB0cy9teXNxbF9jb25maWcuc2gJMjAxMS0xMS0w
OCAxNDozMzo0MSArMDAwMApAQCAtMTE0LDYgKzExNCw3IEBAIGxpYnM9IiAkbGRmbGFncyAtTCRw
a2dsaWJkaXIgLWxteXNxbGNsaWUKIGxpYnM9IiRsaWJzIEBvcGVuc3NsX2xpYnNAIEBTVEFUSUNf
TlNTX0ZMQUdTQCAiCiBsaWJzX3I9IiAkbGRmbGFncyAtTCRwa2dsaWJkaXIgLWxteXNxbGNsaWVu
dF9yIEBaTElCX0RFUFNAIEBDTElFTlRfTElCU0AgQG9wZW5zc2xfbGlic0AgIgogZW1iZWRkZWRf
bGlicz0iICRsZGZsYWdzIC1MJHBrZ2xpYmRpciAtbG15c3FsZCBATElCRExAIEBaTElCX0RFUFNA
IEBMSUJTQCBAV1JBUExJQlNAIEBvcGVuc3NsX2xpYnNAICIKK2VtYmVkZGVkX2xpYnM9IiRlbWJl
ZGRlZF9saWJzIEBRVU9URURfQ01BS0VfQ1hYX0xJTktfRkxBR1NAIgogCiBpZiBbIC1yICIkcGtn
bGliZGlyL2xpYm15Z2NjLmEiIF07IHRoZW4KICAgIyBXaGVuIGxpbmtpbmcgYWdhaW5zdCB0aGUg
c3RhdGljIGxpYnJhcnkgd2l0aCBhIGRpZmZlcmVudCB2ZXJzaW9uIG9mIEdDQwpAQCAtMTI2LDI0
ICsxMjcsMjIgQEAgaWYgWyAtciAiJHBrZ2xpYmRpci9saWJteWdjYy5hIiBdOyB0aGVuCiBmaQog
CiBjZmxhZ3M9Ii1JJHBrZ2luY2x1ZGVkaXIgQENGTEFHU0AgIiAjbm90ZTogZW5kIHNwYWNlIQor
Y3h4ZmxhZ3M9Ii1JJHBrZ2luY2x1ZGVkaXIgQENYWEZMQUdTQCAiICNub3RlOiBlbmQgc3BhY2Uh
CiBpbmNsdWRlPSItSSRwa2dpbmNsdWRlZGlyIgogCiAjIFJlbW92ZSBzb21lIG9wdGlvbnMgdGhh
dCBhIGNsaWVudCBkb2Vzbid0IGhhdmUgdG8gY2FyZSBhYm91dAotIyBGSVhNRSB1bnRpbCB3ZSBo
YXZlIGEgLS1jeHhmbGFncywgd2UgbmVlZCB0byByZW1vdmUgLVhhCi0jICAgICAgIGFuZCAteHN0
cmNvbnN0IHRvIG1ha2UgLS1jZmxhZ3MgdXNhYmxlIGZvciBTdW4gRm9ydGUgQysrCi0jIEZJWE1F
IHVudGlsIHdlIGhhdmUgYSAtLWN4eGZsYWdzLCB3ZSBuZWVkIHRvIHJlbW92ZSAtQUM5OQotIyAg
ICAgICB0byBtYWtlIC0tY2ZsYWdzIHVzYWJsZSBmb3IgSFAgQysrIChhQ0MpCiBmb3IgcmVtb3Zl
IGluIEREQlVHX09GRiBEU0FGRV9NVVRFWCBERk9SQ0VfSU5JVF9PRl9WQVJTIFwKICAgICAgICAg
ICAgICAgREVYVFJBX0RFQlVHIERIQVZFX3B1cmlmeSBPICdPWzAtOV0nICd4T1swLTldJyAnV1st
QS1aYS16XSonIFwKICAgICAgICAgICAgICAgJ210dW5lPVstQS1aYS16MC05XSonICdtY3B1PVst
QS1aYS16MC05XSonICdtYXJjaD1bLUEtWmEtejAtOV0qJyBcCi0gICAgICAgICAgICAgIFhhIHhz
dHJjb25zdCAieGM5OT1ub25lIiBBQzk5IFwKICAgICAgICAgICAgICAgdW5yb2xsMiBpcCBtcCBy
ZXN0cmljdAogZG8KICAgIyBUaGUgZmlyc3Qgb3B0aW9uIHdlIG1pZ2h0IHN0cmlwIHdpbGwgYWx3
YXlzIGhhdmUgYSBzcGFjZSBiZWZvcmUgaXQgYmVjYXVzZQogICAjIHdlIHNldCAtSSRwa2dpbmNs
dWRlZGlyIGFzIHRoZSBmaXJzdCBvcHRpb24KICAgY2ZsYWdzPWBlY2hvICIkY2ZsYWdzInxzZWQg
LWUgInMvIC0kcmVtb3ZlICAqLyAvZyJgIAorICBjeHhmbGFncz1gZWNobyAiJGN4eGZsYWdzInxz
ZWQgLWUgInMvIC0kcmVtb3ZlICAqLyAvZyJgIAogZG9uZQogY2ZsYWdzPWBlY2hvICIkY2ZsYWdz
InxzZWQgLWUgJ3MvICpcJC8vJ2AgCitjeHhmbGFncz1gZWNobyAiJGN4eGZsYWdzInxzZWQgLWUg
J3MvICpcJC8vJ2AgCiAKICMgU2FtZSBmb3IgLS1saWJzKF9yKQogZm9yIHJlbW92ZSBpbiBsbXRt
YWxsb2Mgc3RhdGljLWxpYmN4YSBpLXN0YXRpYyBzdGF0aWMtaW50ZWwKQEAgLTE2NCw2ICsxNjMs
NyBAQCB1c2FnZSAoKSB7CiBVc2FnZTogJDAgW09QVElPTlNdCiBPcHRpb25zOgogICAgICAgICAt
LWNmbGFncyAgICAgICAgIFskY2ZsYWdzXQorICAgICAgICAtLWN4eGZsYWdzICAgICAgIFskY3h4
ZmxhZ3NdCiAgICAgICAgIC0taW5jbHVkZSAgICAgICAgWyRpbmNsdWRlXQogICAgICAgICAtLWxp
YnMgICAgICAgICAgIFskbGlic10KICAgICAgICAgLS1saWJzX3IgICAgICAgICBbJGxpYnNfcl0K
QEAgLTE4NSw2ICsxODUsNyBAQCBpZiB0ZXN0ICQjIC1sZSAwOyB0aGVuIHVzYWdlOyBmaQogd2hp
bGUgdGVzdCAkIyAtZ3QgMDsgZG8KICAgICAgICAgY2FzZSAkMSBpbgogICAgICAgICAtLWNmbGFn
cykgIGVjaG8gIiRjZmxhZ3MiIDs7CisgICAgICAgIC0tY3h4ZmxhZ3MpZWNobyAiJGN4eGZsYWdz
Ijs7CiAgICAgICAgIC0taW5jbHVkZSkgZWNobyAiJGluY2x1ZGUiIDs7CiAgICAgICAgIC0tbGli
cykgICAgZWNobyAiJGxpYnMiIDs7CiAgICAgICAgIC0tbGlic19yKSAgZWNobyAiJGxpYnNfciIg
OzsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku