From: He Zhenxing
Date: May 20 2009 8:24am
Subject: bzr commit into mysql-5.1-bugteam branch (zhenxing.he:2894) Bug#42415
List-Archive: http://lists.mysql.com/commits/74544
X-Bug: 42415
Message-Id: <200905200824.n4K8Objv031852@hezx-dev.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7609905750253344256=="

--===============7609905750253344256==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

I0F0IGZpbGU6Ly8vbWVkaWEvc2RiMi9oZXp4L3dvcmsvbXlzcWwvYnpyd29yay9iNDI0MTUvNS4x
LWJ1Z3RlYW0vIGJhc2VkIG9uIHJldmlkOmpvcm9Ac3VuLmNvbS0yMDA5MDUxMjEzNTkxNy1rYWwx
ZHZ0cXBxZ25qM3ljCgogMjg5NCBIZSBaaGVueGluZwkyMDA5LTA1LTIwCiAgICAgIEJVRyM0MjQx
NSBVUERBVEUgd2l0aCBMSU1JVCBjbGF1c2UgdW5zYWZlIGZvciBzdGF0ZW1lbnQgZm9ybWF0IGV2
ZW4gd2hlbiBPUkRFUiBCWSBQSwogICAgICAKICAgICAgQ2hhbmdlIHRoZSB3YXJuaW5nIG1lc3Nh
Z2UgdG8gJ1N0YXRlbWVudCBtYXkgbm90IGJlIHNhZmUgdG8gbG9nIGluCiAgICAgIHN0YXRlbWVu
dCBmb3JtYXQnIHRvIGluZGljYXRlIHRoYXQgdGhlIGRlY2lzaW9uIG9uIHdoZXRoZXIgYQogICAg
ICBzdGF0ZW1lbnQgaXMgc2FmZSBvciBub3QgaXMgaGV1cmlzdGljLCBhbmQgd2UgYXJlIGNvbnNl
cnZhdGl2ZS4KCiAgICBNICBzcWwvc2hhcmUvZXJybXNnLnR4dAo9PT0gbW9kaWZpZWQgZmlsZSAn
c3FsL3NoYXJlL2Vycm1zZy50eHQnCi0tLSBhL3NxbC9zaGFyZS9lcnJtc2cudHh0CTIwMDktMDQt
MTQgMTQ6MTk6MTUgKzAwMDAKKysrIGIvc3FsL3NoYXJlL2Vycm1zZy50eHQJMjAwOS0wNS0yMCAw
ODoyNDoyMiArMDAwMApAQCAtNjA3Niw3ICs2MDc2LDcgQEAgRVJfU0xBVkVfSU5DSURFTlQKIEVS
X05PX1BBUlRJVElPTl9GT1JfR0lWRU5fVkFMVUVfU0lMRU5UCiAgICAgICAgIGVuZyAiVGFibGUg
aGFzIG5vIHBhcnRpdGlvbiBmb3Igc29tZSBleGlzdGluZyB2YWx1ZXMiCiBFUl9CSU5MT0dfVU5T
QUZFX1NUQVRFTUVOVAotICAgICAgICBlbmcgIlN0YXRlbWVudCBpcyBub3Qgc2FmZSB0byBsb2cg
aW4gc3RhdGVtZW50IGZvcm1hdC4iCisgICAgICAgIGVuZyAiU3RhdGVtZW50IG1heSBub3QgYmUg
c2FmZSB0byBsb2cgaW4gc3RhdGVtZW50IGZvcm1hdC4iCiAgICAgICAgIHN3ZSAiRGV0dGEg77+9
aW50ZSBz77+9cnQgYXR0IGxvZ2dhIGkgc3RhdGVtZW50LWZvcm1hdC4iCiBFUl9TTEFWRV9GQVRB
TF9FUlJPUgogICAgICAgICBlbmcgIkZhdGFsIGVycm9yOiAlcyIKCg==

--===============7609905750253344256==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/zhenxing.he@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@stripped
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b42415\
#   /5.1-bugteam/
# testament_sha1: 3c76ce858c9ce72ddbee999b9f8457e3e98e42cc
# timestamp: 2009-05-20 16:24:36 +0800
# source_branch: bzr+ssh://zhe@stripped/bzrroot/server\
#   /mysql-5.1-bugteam/
# base_revision_id: joro@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUZqVngAAaLfgEQQWef//37u
3jC////wUAQ49QDrurakGmEpCmaSZ6SZiaanoTaaaj0gwg0BoANAVP1TUepoNDQ0BgTIAAAaGmDS
NAShNEyTJPTRqTZBMmj0QaMaATQ9I9QDHGTJkxGJgBMmCZADRhGAIYBJImIaaEGmkYmImmp4o9NQ
bUaGgAeiY3zac2+U16zcptyRRUtWF+47qBoJNVnWnVckfAtnjO3aUVaeKfl5cORlgQXp+k+3J47O
JrDuqgQ/zHlBLz9Ya123iMKQm6lldbOeSlbjxchNWF0qGKJ1+7g3fjx4FjO+vezeaTt2x/JkHp/T
5seyb1UInPOYxTAXmuOWU7bKo37FQN4QyGpCBvymkRFmM1LssIwUQJDQTjEMTxkxUAaSyWgPbaaB
UUmUHbn09IHdEmuWgdTpo+yCG7ysJhUU67YOiQNJ/ehMtgsdkRR2H2rETCIlETJFBZnqer7RSiba
LfKUTawcQod0CpityzGC4/wp/qx3+10i0cnXycwve2ZEz3sbjA6jptkPLy0/7VnTXZjUzvs5Yal+
Nzhb046jcpi6S82Bv8iuxY3aOJjmYDHYtAxXXKGknrWJ07CnpziXhesjEafrhftpbqkpixMI1Ulu
MzeRLBEDoVREyoZEBRkXtfIYtT3lAh3nH3n0sLix3aCJQ+h5rDwY4/keHg+KJDFRKyHUARD0KoIA
K2LeU/XmVL2nIdKkcGFOXvRNJmoAZbtQ4YG2fDbDxaVQd51lh95z+bPqJpcw/BfCGBSFKFC12hNX
EMUGmATZFYJHGsrJXH9DO3uuVBBy31X9ZqMCOoq6ReqhSVlluh716EQYxEZ09JqNWVYp6CCNiEci
KOodcbgMd4iOkupuy0v5chsM3YMLz7XQUBQE0pZMvJpLSxEjwLtWEQrJPnJvZoukJVdsmJGCKg4h
PHLT29B0g/gY3A+04XAWqGvcuBpOjIHhkZmB8eN5JwLRPC+wyCgJEhlZCiK8Ug+ePERYIy2G5a2a
FyDDOin2/LYlZGrZULEzUOput2unzFAgPK9pvCBNeYNP3WlIn5w2HpEBRNEpEuxUubW5OYjrmHqR
HGhaTA4SknWJSkKaSd7exA/HTKZt9tSINaI+LOfOIz0x2zDZglOg23K7IXy8CZhMc5z1qEM5LE33
kkVNJkDzdd9SrXbOywRYyK3JwEOQaC1fc202gqy5ku58EVWWAwvBcnrsWHMN2Nhw4cFXErDU4nlx
Vlg3OCYoXrVZhd0M5MHU862Fd26r2T644ztFsVrlSOIVoqZMtpwfEZsqLSud+cJa08ouq5A6a9hr
bPjaGGbNZMOIQXDMLcjKjci0Ya7hYi5gh/x4SYS/GTtZK8VecqK2B4XLuTKDKvl4qo7Dl1t2WiJt
fS7HmUFd9eFclp5PAwUTyOXbihwvcLzFZMDFTV7tA7yE90+9WSd4trgvGX7qKkV1iNuT4bp/i7ki
nChIIzUrPAA=


--===============7609905750253344256==--