From: Date: August 6 2008 4:21pm
Subject: bzr push into mysql-5.1 branch (kpettersson:2682 to 2683) Bug#37003
List-Archive: http://lists.mysql.com/commits/51014
X-Bug: 37003
Message-Id: <20080806142150.4344A5300D2@Adventure>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDI2ODMgS3Jpc3RvZmVyIFBldHRlcnNzb24JMjAwOC0wOC0wNiBbbWVyZ2VdCiAgICAgIE1hbnVh
bCBtZXJnZSA1LjAtPjUuMQptb2RpZmllZDoKICBzcWwvc2hhcmUvZXJybXNnLnR4dAogIHNxbC9z
cWxfYWNsLmNjCiAgc3FsL3NxbF9wYXJzZS5jYwoKIDI2ODIgRGF2aSBBcm5hdXQJMjAwOC0wOC0w
MQogICAgICBCdWcjMzcwMDM6IFRlc3RzIHNwb3JhZGljYWxseSBjcmFzaGVzIHdpdGggZW1iZWRk
ZWQgc2VydmVyCiAgICAgIAogICAgICBQb3N0LW1lcmdlIGZpeDogQWx0ZXIgbGlua2luZyBvcmRl
ciBzbyB0aGF0IHRoZSB0aHJlYWQgbGlua2luZwogICAgICBmbGFncyBhcHBlYXIgbGFzdCBpbiB0
aGUgbGlzdC4gVGhpcyBuZWVkcyB0byBiZSBkb25lIHRoaXMgd2F5CiAgICAgIGJlY2F1c2Ugc29t
ZSBsaW5rZXJzIHdpbGwgbm90IHNlYXJjaCB0aGUgdGhyZWFkIGFyY2hpdmUgYWdhaW4KICAgICAg
aWYgYSB1bmRlZmluZWQgc3ltYm9sIChwdGhyZWFkX2tpbGwgaW4gdGhpcyBjYXNlKSBhcHBlYXJz
IGxhdGVyLgptb2RpZmllZDoKICBjbGllbnQvTWFrZWZpbGUuYW0KCj09PSBtb2RpZmllZCBmaWxl
ICdzcWwvc2hhcmUvZXJybXNnLnR4dCcKLS0tIGEvc3FsL3NoYXJlL2Vycm1zZy50eHQJMjAwOC0w
Ny0yNCAxMzo0MTo1NSArMDAwMAorKysgYi9zcWwvc2hhcmUvZXJybXNnLnR4dAkyMDA4LTA4LTA2
IDE0OjIwOjQxICswMDAwCkBAIC00NzE4LDcgKzQ3MTgsNyBAQCBFUl9TTEFWRV9JR05PUkVEX1RB
QkxFICAKICAgICAgICAgc3dlICJTbGF2IFNRTCB0cu+/vW4gaWdub3JlcmFkZSBmcu+/vW4gcGdh
IGVuIHJlcGxpY2F0ZS0qLXRhYmxlIHJlZ2VsIgogRVJfSU5DT1JSRUNUX0dMT0JBTF9MT0NBTF9W
QVIgIAogICAgICAgICBlbmcgIlZhcmlhYmxlICclLS4xOTJzJyBpcyBhICVzIHZhcmlhYmxlIgot
ICAgICAgICBzZXJiaWFuICJJbmNvcnJlY3QgZm9yZWlnbiBrZXkgZGVmaW5pdGlvbiBmb3IgJyUt
LjE5MnMnOiAlcyIKKyAgICAgICAgc2VyYmlhbiAiUHJvbWVubGppdmEgJyUtLjE5MnMnIGplICVz
IHByb21lbmxqaXZhIgogICAgICAgICBnZXIgIlZhcmlhYmxlICclLS4xOTJzJyBpc3QgZWluZSAl
cy1WYXJpYWJsZSIKICAgICAgICAgbmxhICJWYXJpYWJlbGUgJyUtLjE5MnMnIGlzIGdlZW4gJXMg
dmFyaWFiZWxlIgogICAgICAgICBzcGEgIlZhcmlhYmxlICclLS4xOTJzJyBlcyB1bmEgJXMgdmFy
aWFibGUiCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3NxbF9hY2wuY2MnCi0tLSBhL3NxbC9zcWxf
YWNsLmNjCTIwMDgtMDctMTcgMTg6MjY6NTUgKzAwMDAKKysrIGIvc3FsL3NxbF9hY2wuY2MJMjAw
OC0wOC0wNiAxNDoyMDo0MSArMDAwMApAQCAtNTcwMSw3ICs1NzAxLDYgQEAgYm9vbCBteXNxbF9k
cm9wX3VzZXIoVEhEICp0aGQsIExpc3QgPExFWAogCiAgIHdoaWxlICgodG1wX3VzZXJfbmFtZT0g
dXNlcl9saXN0KyspKQogICB7Ci0gICAgdXNlcl9uYW1lPSBnZXRfY3VycmVudF91c2VyKHRoZCwg
dG1wX3VzZXJfbmFtZSk7CiAgICAgaWYgKCEodXNlcl9uYW1lPSBnZXRfY3VycmVudF91c2VyKHRo
ZCwgdG1wX3VzZXJfbmFtZSkpKQogICAgIHsKICAgICAgIHJlc3VsdD0gVFJVRTsKCj09PSBtb2Rp
ZmllZCBmaWxlICdzcWwvc3FsX3BhcnNlLmNjJwotLS0gYS9zcWwvc3FsX3BhcnNlLmNjCTIwMDgt
MDctMTUgMDE6NDM6MTIgKzAwMDAKKysrIGIvc3FsL3NxbF9wYXJzZS5jYwkyMDA4LTA4LTA2IDE0
OjIwOjQxICswMDAwCkBAIC02NDg0LDE1ICs2NDg0LDI0IEBAIGJvb2wgcmVsb2FkX2FjbF9hbmRf
Y2FjaGUoVEhEICp0aGQsIHVsb24KICAgICAgIHRoZC0+c3RvcmVfZ2xvYmFscygpOwogICAgICAg
bGV4X3N0YXJ0KHRoZCk7CiAgICAgfQorICAgIAogICAgIGlmICh0aGQpCiAgICAgewotICAgICAg
aWYgKGFjbF9yZWxvYWQodGhkKSkKLSAgICAgICAgcmVzdWx0PSAxOwotICAgICAgaWYgKGdyYW50
X3JlbG9hZCh0aGQpKQorICAgICAgYm9vbCByZWxvYWRfYWNsX2ZhaWxlZD0gYWNsX3JlbG9hZCh0
aGQpOworICAgICAgYm9vbCByZWxvYWRfZ3JhbnRzX2ZhaWxlZD0gZ3JhbnRfcmVsb2FkKHRoZCk7
CisgICAgICBib29sIHJlbG9hZF9zZXJ2ZXJzX2ZhaWxlZD0gc2VydmVyc19yZWxvYWQodGhkKTsK
KyAgICAgIAorICAgICAgaWYgKHJlbG9hZF9hY2xfZmFpbGVkIHx8IHJlbG9hZF9ncmFudHNfZmFp
bGVkIHx8IHJlbG9hZF9zZXJ2ZXJzX2ZhaWxlZCkKKyAgICAgIHsKICAgICAgICAgcmVzdWx0PSAx
OwotICAgICAgaWYgKHNlcnZlcnNfcmVsb2FkKHRoZCkpCi0gICAgICAgIHJlc3VsdD0gMTsgLyog
cHVyZWNvdjogaW5zcGVjdGVkICovCisgICAgICAgIC8qCisgICAgICAgICAgV2hlbiBhbiBlcnJv
ciBpcyByZXR1cm5lZCwgbXlfbWVzc2FnZSBtYXkgaGF2ZSBub3QgYmVlbiBjYWxsZWQgYW5kCisg
ICAgICAgICAgdGhlIGNsaWVudCB3aWxsIGhhbmcgd2FpdGluZyBmb3IgYSByZXNwb25zZS4KKyAg
ICAgICAgKi8KKyAgICAgICAgbXlfZXJyb3IoRVJfVU5LTk9XTl9FUlJPUiwgTVlGKDApLCAiRkxV
U0ggUFJJVklMRUdFUyBmYWlsZWQiKTsKKyAgICAgIH0KICAgICB9CisKICAgICBpZiAodG1wX3Ro
ZCkKICAgICB7CiAgICAgICBkZWxldGUgdG1wX3RoZDsKQEAgLTY1ODEsOCArNjU5MCwxMCBAQCBi
b29sIHJlbG9hZF9hY2xfYW5kX2NhY2hlKFRIRCAqdGhkLCB1bG9uCiAgICAgICB0bXBfd3JpdGVf
dG9fYmlubG9nPSAwOwogICAgICAgaWYgKGxvY2tfZ2xvYmFsX3JlYWRfbG9jayh0aGQpKQogCXJl
dHVybiAxOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBLaWxsZWQKLSAgICAgIHJl
c3VsdD0gY2xvc2VfY2FjaGVkX3RhYmxlcyh0aGQsIHRhYmxlcywgRkFMU0UsIChvcHRpb25zICYg
UkVGUkVTSF9GQVNUKSA/Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRkFMU0Ug
OiBUUlVFLCBUUlVFKTsKKyAgICAgIGlmIChjbG9zZV9jYWNoZWRfdGFibGVzKHRoZCwgdGFibGVz
LCBGQUxTRSwgKG9wdGlvbnMgJiBSRUZSRVNIX0ZBU1QpID8KKyAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIEZBTFNFIDogVFJVRSwgVFJVRSkpOworICAgICAgICAgIHJlc3VsdD0gMTsKKyAg
ICAgIAogICAgICAgaWYgKG1ha2VfZ2xvYmFsX3JlYWRfbG9ja19ibG9ja19jb21taXQodGhkKSkg
Ly8gS2lsbGVkCiAgICAgICB7CiAgICAgICAgIC8qIERvbid0IGxlYXZlIHRoaW5ncyBpbiBhIGhh
bGYtbG9ja2VkIHN0YXRlICovCkBAIC02NTkxLDggKzY2MDIsMTEgQEAgYm9vbCByZWxvYWRfYWNs
X2FuZF9jYWNoZShUSEQgKnRoZCwgdWxvbgogICAgICAgfQogICAgIH0KICAgICBlbHNlCi0gICAg
ICByZXN1bHQ9IGNsb3NlX2NhY2hlZF90YWJsZXModGhkLCB0YWJsZXMsIEZBTFNFLCAob3B0aW9u
cyAmIFJFRlJFU0hfRkFTVCkgPwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZB
TFNFIDogVFJVRSwgRkFMU0UpOworICAgIHsKKyAgICAgIGlmIChjbG9zZV9jYWNoZWRfdGFibGVz
KHRoZCwgdGFibGVzLCBGQUxTRSwgKG9wdGlvbnMgJiBSRUZSRVNIX0ZBU1QpID8KKyAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIEZBTFNFIDogVFJVRSwgRkFMU0UpKTsKKyAgICAgICAgcmVz
dWx0PSAxOworICAgIH0KICAgICBteV9kYm9wdF9jbGVhbnVwKCk7CiAgIH0KICAgaWYgKG9wdGlv
bnMgJiBSRUZSRVNIX0hPU1RTKQpAQCAtNjYxNSw4ICs2NjI5LDggQEAgYm9vbCByZWxvYWRfYWNs
X2FuZF9jYWNoZShUSEQgKnRoZCwgdWxvbgogI2lmZGVmIE9QRU5TU0wKICAgIGlmIChvcHRpb25z
ICYgUkVGUkVTSF9ERVNfS0VZX0ZJTEUpCiAgICB7Ci0gICAgIGlmIChkZXNfa2V5X2ZpbGUpCi0g
ICAgICAgcmVzdWx0PWxvYWRfZGVzX2tleV9maWxlKGRlc19rZXlfZmlsZSk7CisgICAgIGlmIChk
ZXNfa2V5X2ZpbGUgJiYgbG9hZF9kZXNfa2V5X2ZpbGUoZGVzX2tleV9maWxlKSkKKyAgICAgICAg
IHJlc3VsdD0gMTsKICAgIH0KICNlbmRpZgogI2lmZGVmIEhBVkVfUkVQTElDQVRJT04KCg==