From: He Zhenxing
Date: May 7 2009 6:48am
Subject: bzr commit into mysql-5.1-bugteam branch (zhenxing.he:2864) Bug#42415
List-Archive: http://lists.mysql.com/commits/73556
X-Bug: 42415
Message-Id: <200905070648.n476mCB0007967@hezx-dev.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8194375909177935427=="

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

I0F0IGZpbGU6Ly8vbWVkaWEvc2RiMi9oZXp4L3dvcmsvbXlzcWwvYnpyd29yay9iNDI0MTUvNS4x
LWJ1Z3RlYW0vIGJhc2VkIG9uIHJldmlkOmFsZnJhbmlvLmNvcnJlaWFAc3VuLmNvbS0yMDA5MDQy
MTE0MzEyMS1oN20xYW1tbnB0NzFtNTRnCgogMjg2NCBIZSBaaGVueGluZwkyMDA5LTA1LTA3CiAg
ICAgIEJVRyM0MjQxNSBVUERBVEUgd2l0aCBMSU1JVCBjbGF1c2UgdW5zYWZlIGZvciBzdGF0ZW1l
bnQgZm9ybWF0IGV2ZW4gd2hlbiBPUkRFUiBCWSBQSwogICAgICAKICAgICAgQ2hhbmdlIHRoZSB3
YXJuaW5nIG1lc3NhZ2UgdG8gJ1N0YXRlbWVudCBtYXkgbm90IGJlIHNhZmUgdG8gbG9nIGluCiAg
ICAgIHN0YXRlbWVudCBmb3JtYXQnIHRvIGluZGljYXRlIHRoYXQgdGhlIGRlY2lzaW9uIG9uIHdo
ZXRoZXIgYQogICAgICBzdGF0ZW1lbnQgaXMgc2FmZSBvciBub3QgaXMgaGV1cmlzdGljLCBhbmQg
d2UgYXJlIGNvbnNlcnZhdGl2ZS4KCiAgICBNICBzcWwvc2hhcmUvZXJybXNnLnR4dAo9PT0gbW9k
aWZpZWQgZmlsZSAnc3FsL3NoYXJlL2Vycm1zZy50eHQnCi0tLSBhL3NxbC9zaGFyZS9lcnJtc2cu
dHh0CTIwMDktMDQtMTQgMTQ6MTk6MTUgKzAwMDAKKysrIGIvc3FsL3NoYXJlL2Vycm1zZy50eHQJ
MjAwOS0wNS0wNyAwNjo0Nzo1OCArMDAwMApAQCAtNjA3Niw3ICs2MDc2LDcgQEAgRVJfU0xBVkVf
SU5DSURFTlQKIEVSX05PX1BBUlRJVElPTl9GT1JfR0lWRU5fVkFMVUVfU0lMRU5UCiAgICAgICAg
IGVuZyAiVGFibGUgaGFzIG5vIHBhcnRpdGlvbiBmb3Igc29tZSBleGlzdGluZyB2YWx1ZXMiCiBF
Ul9CSU5MT0dfVU5TQUZFX1NUQVRFTUVOVAotICAgICAgICBlbmcgIlN0YXRlbWVudCBpcyBub3Qg
c2FmZSB0byBsb2cgaW4gc3RhdGVtZW50IGZvcm1hdC4iCisgICAgICAgIGVuZyAiU3RhdGVtZW50
IG1heSBub3QgYmUgc2FmZSB0byBsb2cgaW4gc3RhdGVtZW50IGZvcm1hdC4iCiAgICAgICAgIHN3
ZSAiRGV0dGEg77+9aW50ZSBz77+9cnQgYXR0IGxvZ2dhIGkgc3RhdGVtZW50LWZvcm1hdC4iCiBF
Ul9TTEFWRV9GQVRBTF9FUlJPUgogICAgICAgICBlbmcgIkZhdGFsIGVycm9yOiAlcyIKCg==

--===============8194375909177935427==
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: 7d9aec6da15fb56c8f963aba028d4444960a2d1a
# timestamp: 2009-05-07 14:48:12 +0800
# base_revision_id: alfranio.correia@stripped\
#   h7m1ammnpt71m54g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTf8TbEAAbZfgEQQWef//37u
3jC////wUARWbwcXnGIREwkkTUwCaTYRMj0psIgeKMhoAAabUEpIU/U2lP00yNU9R6mh6jagAAAA
0A0A1TyakyYgGgAaAAAAGg0AAanqJPRBoDRoAABoAAABoAJKBMjFGiY0p6MjKep6IaBiZAAA0HTW
7cdUZl0bhlq0UKSlUtelNMoBppyMbRl6XovvKqnnZIIEUN9bwkKMSxgyz8WNkl/u8bY2sKCvpiBS
0geXehS0XBggplCDjTRoICDSBF0CmSMFaIBtcar2CJjedDh0latLO4idpvfqYR7f0+djZO9RCJp8
84xS9YXXTimllfDR+GINaziLzrRnhslcrBM0jW0vq6DmAuA1y3iJizEhdSgIzjo0Dg8aVRRjM+tq
dXtgPXkCRucUpyUc8tykiKc0nxDbDF4aj5Mclaa1+Q0BcdaFEkmK0aSO874PqZ7jXZAz6Roag6Lh
0mrAccekg7Kfo1F9LncHRJjU3FEm5g9dlR4cZIweJ7iKkZsBIRnnplVdLzXvE2u6lxjS9LCYWXCP
EaPBhjzCWDUyXjxIKNQz1FBgji2LijFArYWKBom6ksTrfkoEgTvtkK0uNgwFb6Q/IxxEKYiSO0Bh
UawizOmXVKQweMeXiGm8gZuKpoLEo4hlGNVybEmEMDV6xUIRVIuWAsN3XGApKHiK28YHlMpC1JVW
JQQjmQ2STFt5lP7NSmvUTw+1CfKzD874K/FpklyfKCQQDLwsOvJZniAdZ2mHeuTqdh2FSWsLO4lj
5jYskeSsctb31C47h7BvkFxviM9RmM9Bypsxd9W4NNzcC/KRcTQdsIppp80Vbb0hwylISaOFbPTk
0grSIwMJ6I7TRjKz3Hhhqhh3Habu4cX2RpLA7TYW9w45TS/Nz8BxVLHNl9SAQdQjdOpXGERSx/i0
UHJiHiLcccm/A0g7WZKA7OKZx1AmrNHKspyDDNf0PMDYNDUZT47bzDiyCclyKmmBqG97JZlzc764
DCdJ+93SW49VSakPBzovS64ediVG3xvSlxRX/QzqLUup2111XIUCA8o0GAQKF9wajhOyX+6ooQVy
BxosZLJZ10x6+AuotfMcLw2HPKvUZnx84bQybLDbVHuSMa8yllFION/kE/7dFRnnkTk2wvKaFR4y
lbhrW5RDEsR4KFiH6BNixA88c2qS33qd1oi1iLWpoFmsHJorzrpgYArCrEuDoIfK0GCetbluWLYG
THaatWpSsJBlaTzSkMitCoZJVnoY3ATBwZ8qgYWpwqtdlbJ80eSqgUymtxZQgpEMyZXlb8QzWUrK
tNV8I7U8pXGhA6dbyxs3RMGO9mlnDpENbYNWnMndbSuHXLJ0vMUC5HIificLLjJJhVPTqJs48kwH
BQT2KPT0p5tObazbaIuZWlMfMecVOy+UVl2uAgRObnxIskBRSU21GtZHqNgtMCbY4zl/e43IrbmO
4x/F3JFOFCQN/xNsQA==


--===============8194375909177935427==--