# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090930024514-kuup19wk6u99uomd
# target_branch: file:///home/daogangqu/mysql/bzrwork/bug46998/mysql-\
#   pe/
# testament_sha1: dafbe8e2371112bdbeab7ac741ad896e783d8bb6
# timestamp: 2009-09-30 10:47:35 +0800
# source_branch: file:///home/daogangqu/mysql/bzrwork/bug46998/mysql-\
#   5.1-bugteam/
# base_revision_id: azundris@mysql.com-20090929182821-iqbk98bbw8zre6nq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWa4hKgAEm//3P9a3Rl9////
f///P/////oBAABBBIgBBAAHYBoc9SBL6Fg0qqaJiBWtsaNFsaAI2U1a1SAFUURLWqGtUKANsRAU
kA1lSqCgY4AAAABoAAAAA0GgAAAAZAGgAHAAAAANAAAAAGg0AAAADIA0AA4AAAABoAAAAA0GgAAA
AZAGgACRIEE0TU9NNTEyjTaQepp6gGmhpkGjQ0NAAAAAGjQBFIgE0ZCaZBpNkGiek0BBTNRkNNP1
Ro9T0mnqAAeoaAPU2oMFSSCZGgEAI1NPQjRT9T0pp6IZqZA00xqZGgA0AAAaPKaJynSIic6kVSO3
7lyArjSSAfwtIF7PwO1JynLcQGyEdPq9SJAe20R3vwe577h5JHUQDSQbNl+zXRFCkhkC7YVeZIRS
UIH44SaB0wgSVIhCOgHEQp+GoQHzAwG0L7obbgIhtutScDC/+e3CaAd1vYp3QP2Ul6/b7/j+RAz/
98n5rRDmQI/Rxl9e0dHJfIpEOtAj7vd/TYp+2fD7v6rkDkDBEIBpAefmOw43n0/wXoL0aNv0+x2I
7IXduG0ea8mucX5ExfloPyzN5yRWc5ZE2bH2e2ezsqzrPUyZtGspp0lmXaiQ9cxbiYGINC/ZNUtY
fjN/Ll9J0uufDSjc4VTAXMQXiTBYpo39MyRp25k+XsnLKuAlczCkHXGQMDAGIJrYmkiw5tPdgyYS
cZPfkSpAqxcpCDBS928taDQybvo3holaKuMHKRYV02UkrYxdjfmclxZQZmmfWVR4kEQob4LQPqI/
LF9zNmtGf8U1kIXM2Z2hD1bmQ9of5BvOBZJLOsEc9Jg0SRBIokvwNvYx8zdbe7vNumPyua5yfln5
DaelqfwB0Q9EmdLFUSqUobG02xt99+aAz77g4uK055rpq9QAUI1T1M1zpKTWEqSpRw21KJ4w3OUT
tgFavGLFpS1uUqXSJtuJkiHJOICEWUFbsKGDJ0bWF2GzGksLVncyGY3O6TpEO4lSk7Y7RxlQYkwY
wZoX7qHke88lz8Sn5Oqji5l4ap/RKiYz7zMnu9F8uU3tvPr7GJTud/ZpYK0yPY3ahhk2GVoZDlaW
whhhbD+gzZs2Hf7OCvscRwzxEjKeDANDAHIx/wzGOAyGlrkGpgL3QH7BN5Sphh6SsgZj9Ss6Vb8j
aSYIT+05ni85+/TVeSHE82pvO1pLyoYQxJsP+7CXFbJoGYwGR5TFmsvRapNXJpgUTUkjMmNg9VlR
X2EbE0xjTTIIYYIVJOSSzsFLG1hrgC5+LIS2s/Qzclo0XWvK5Gd5lB6Faq2mmnG5o3oAefH1+Uer
tglx/zSe92ukr1RcZvLnrFeKtxUYRh2tESi0RLv8MHvs0EpRKJEstHw1eqowtMZ23X1Ud75ezxmi
12VQ+h9T6WoBDowNMYm2xsQNpIfijDuRMS+sZ0k1zvg5sHaZyYTSUglEJNkwTQqVDwYQ2HfrFEkl
0SEQbfPbezl78RDjhKoDb4ztFK27i/CNKXrV6zvS2yLZSiXtPFJTIoJh/goBakgMR/n+wY7SZMGR
CoaTDg5UMmXqZA+hqDIfOesyyekUYamrhVU+KFoiz5SpxUSS6dqGIUkkOL0p6Ww9aHwsn1e983Ss
4AyhvbhUk5WNYhd3sNQm/yvUbwPc6c5ZmCYGVC8zuZ0Fz4lRC40zx00UUW+9phztgwrCt8QEMDCE
8VG2UviSa8bkvvJSpY7nB7aVrd/bJ4FMXpYP5V7JjlUn1Od1xrxjC4euQNgSXIKwmtJmwNejgGbd
QiICIhfcqrbTUAmmt2+9xERHIFDcGqCNvVwTLb3N2RbWkEMBtLjYSZNik1DVHDCl9LksF4YecYDu
cgoFBF6pGcwk2GuHi2JIxMUNhhaENGd+pkx1QvhlfkheyYODU8l0wSRRc9nzfCwNNayGqFmgatW9
hiVua6aNbdyTQ7i5tzUwa7Lrr3Y45sJns9VtrZJBsZTYshRJLloWWX+5WtNBQ1NnNmxc1ymLgycf
rVKr7W5sMWbm5OT59/Ky522VIdGNkwrbK8VJhV8ODSSICrL2oaHVXl+m7BeNvMHvgsjMEoyWrBNN
t/FylvtZQ5sdjsL4XGHdMfB4NzZny7jWzTys76JJWTwJlIhiAXsonUdBb0xzSx040UX6LMM7pY2Z
K2Y2m+s27nlrRqxaJOi4zXyrOFmVcG8ZHIZmkUtNWEGsmYBSqLWWdTrVaiZWqia1HOSwsKnSGhni
Qbp4l7fylQ2CF6FN9h8omvZznGYSNJ0zqSaMjeydTixXuhgs2yKaKZNhzYJJo5up160L2mre54W5
+FJuuYl0p4ODfu8044PN3UV1oaN+lTZ2kkd7BDRyc2bURo0t1U56OWci3TOXaFbmX5F+cQZFr09Z
AxBaiNqbsJIYIXTHAwanY28DK1ldit+ymmKmc2OjHc1uF3OcnBczaY6N1Q4t7Jzma+kNa9g7zk96
ayxkyN7s657UPb1/+QvQxnzat3btmxPTGcNrGLrrdqZydgqXSAIdhYi6jNXUNGM4oZYVLlnXPAuu
d7UvO02stj7EMGm5h6GjU3OTCfVhdnnmFzDiyDBwvb8rTgrerpUYNerPLCXTJ35M2ijWyhzhrMXB
wYN7veDQ5DQIVs0N+d0UVaDCNOwnhMlhPWxSVtankDLcoxJCWsnOVaF2RMJCDWc2KzDuncuUZyWK
lNfYyWuX2mCpwejTBrv0RtZ5fKjPmz4sHp7lt+bqhc8IdsM81L3BZ2rukvTOmk7pujNJ1NrcWaLP
QeEOx65lOxtfMh2zmqWm5B1c+85/u7vvIW7OQ5M3LujPhOswZFtVVs6CqMGjcMBpKyrOeGaGkR2f
YrdqNvkYtL+txdI3ODD28WxF04eL5Pj8FvDzvK27Mjebm10MJhtXusLek6OV18q9rYsnocnUjSVD
pbdiFNjLwdcu4FMKqsltay+Hr3PfU2TDzt6z4pg5NSnBuXtUNveoxmU8Yb1psnlPpQ+mq58OrdrU
uKdG7iwat+XPb0rmvCdTAzxdc5smxDZzbNDdss+Jk2Y6mXZwzbnWtxq62pumu5tVg2OuetjhyU37
UYlUkzWYOhuPd3WdDpdPJc5GU3MVPonlD4KbZ0nOHtRadVpd110dVtrp26pa0vDDDhD3sL3Jdi0M
Sy+vIEjW5jUTLaZc4XHg4E3YdLf4IXFWZLi4kZNDI3BtazAqKiNTWJIi4QvJ3TbDI6FKHg3EwSlx
OQyIZCxCD1oZ3vKUOJwuOpsujLYcqU4v/GSu4K6tu6sRTVjjXxAuZcangrcJMxoXyjNXBspfFT1b
2EuNQWMl7GYNselDLTNmfU9Ky5x2Xbl+mjteCzHG0x1Xc+MxxYM1noaOM0ZMi4sTLBYjcVxfli4k
YRtZYkpVpOxnkgsTaSG5TAubla1JfKl7GkuIpCkmFJIvYNroLmps01LnBmXQv6NTc0hqYtLqmqjt
YJzzEGAlBynmJkaHKZDINxpLjA7ONBceohuRlIyvzLqcZaa5pF8KUulUii+RpcxMooUmLJsLWhAr
UqgWTS0Nlohb+b6Em9ZucfFy+CXmD71ttttuKk4Xgq8EdEaEFhbn6B3heSEf3WFJq+x1B4s1LBic
EdhESii0toVKKVKWLpaoVJHxvtrlmKk5CQSPtAJFhcWFgWD2OIu5uZtDJmwUEWNS+e1ilT5IPhdw
+4pSiP7Vyz7L260YIDyfkJ+7dg0ip1qP4AD7g+0/Oe1/IbtbEQkDEQsDERI+1RkOl2fEGTA7H/0N
vc2n+Z9qjc1+M1yLlk163c86za2sP2x4sz4zifhmTVPgRjg5O5B7ljvTJrdwXGAjUjBr3Na5+UuQ
U9Uw1MgyPxySbTNaXo2miSfTEZ/jkTORNDa4IotInM0fQ+g9Ci59AbYSitSJ5wpH0C+STJilkvRU
0TwOyRN5C9FmjYH0opHWPrz6kdGjmdbYWcjvT3p7/votLlTPg1LeD+JiTqUUYLB1uYuDR3LHwTes
kdakLSTtUOoKKWNgXoueSKLkappLWVaVUpNWt0s2R0o7Byj8SjA944IxPrHsn1RB8h5nwT2fNM9z
SQkH3mtSgghCakgayR9R86jAwQ+62Ro/TkvfpGb7KplF33t0lz5mBugIIBuhKbzMfEmB+A9RzQr1
tWiatr+I/GfFjjxJP2Hz9q9+591+o+67Z99994FOpwfgZuLk5uL8Dxa2jDnzal0Q1KQ2HN7+Pi5I
nkmapi2u5U4txexbWUGaHi7PwO6GXyT92755Jm3PVBNTPsXK6Eb39R2ipkaVTi7xUvLhDGo1DWh2
oPXxncRvUkqUlbxpCbVSTVNsks4S6R0jtn2j5Cmb3oZoYvudp9ulU9jaeb0VZ2LLvW19D1KU/DNT
1uE9kP12hraPW6ywoM+fWekoMAuHgQcuIp1sK5DSWFaXEFx5oVliFJUWFxkwQ0ZVV/CQxjiRI6Yl
DfEv/9bgr2DDf6HKhDgFjvyD0YlKHlsaU70PpePVMz7KRNk80qHF7jzHM2lzme2XLnPu8z1u3zsV
6lOza9LxdkT4/hJqVNu3Y0N/Fzdqpd2NJiWHUeLxrY5HA0P5+0DaJzIQ32MSQsdLUXKqa4UGIhBi
jIaqNcL424iG4iG7CxWZAwe+ToQ5ajQgVtJxIkD0tqsmFJtdKamMJafE9TtYPFwy3Ox6DvyWbWbz
921qdza7oWOdWHQaWByOdAgpZnpN5WKHKlRSHiYLRvilpKLRS0VO+O+DSeeWLix8Lzn0lwSaXoNZ
N7zjpMT6HnKjLzncw3lenk4IaBeoPch0oeDofaB2uY9AmU2cNJ0GZyHl5HiYExmwr4kOATZI0KeL
MCe2QHvgCpgYUoGGQVtavarnajGpdE+W3xpLRtIU5D1NPj49FnOEDN5biuWRWg+aHDw4YN3RjKM7
h7VFoC65uSOI5pU5jtKA5XbsV81hgOdAtNI5B4tkc0EEArvOiEwQydbg76anctJNiHZt+ues99zL
gczpL2wg5ZPkGUaptFKQ8p3HKaA021vTQTVnsLD0pRabHTNNqYJnOmVzmNIXDgnwIZiRWpIKEIYZ
KnRZ0MN85NJBqe6Q9LlpCYHcwzQOYQgpAxYVzTm5iY5trQBQgUiBYJ8zECQqk2BqRKFta5HzJpH0
pDUCHUGQmFBag+gwC9zPpR2pIWTCPFJPfeZ4FO9ceZZ6lniUoqYNTzslnA8TuLC0yFZItMguVqMx
mFmQnIfWp4Oo81PFSkXYwgX4iHxIa+99Ia0KxPcHUEl0nuQyudpdIabjvZKEghksmSsCpAAdTJwI
mA4FYqVgeGwbt7JFsZdqFpWNAh4NYWth0n8zgUPqrVq82tcEL0IK1CeUF8UIknehRSIcWACIGHVS
DN00B63yQpG0NCGDYnnvFZc7uQxOah85czc9iA9QeoCKx+s/23gPaLpDIGncHIh3Pmhl7nMKPQEI
FJ5OIHNyuKnMMDspKHCh1DeIUCFfU8pGdrAEIuEUfiNxENxEN3kJJdN9BUUKuRNsqRUQqFSKVKKC
m00nedcPCZCRBwwEzBwdfMCHtGlsekO4LWGSHQ51Lff7jueTMh2lWW5CSGrhihX5PY8da8EOsTeh
taKI1oVZnnDtc7IQ/ZdnN5O08zpev2bDEDeJc9M9njI8xmWSNyGLwqHXKjpmCaikrF5LJ3qvQOLt
n153Q2RO+SVFqkaVCZl8MZoMXIVfXL3oZGov9wtMZ3tXMcRQCzSADPUIexhuQNAFDlb1dfeh2tDu
1vFymd3Bdys2rkZuYJIAdQhIwcStsbeTg/ZNekrcglZDCBI6MqEzUp87xah7UL1tE6DW2touzceb
ShpcnDkDzU7G4D76lA5QhHg9iHIyZISZMkJNDIDHO3hEMDqYIkSYUmwMMgJQLvQWAToIZkIdp0M2
YgbghcqhkPS03BDWwORmj+0QzELxUhnPJZF8EqY2lIbpiY4ER7FlkPBsEygflO92t6pWgXsKwqEA
EIQQi1uITQ82K/Eev5GFcIMYaXIgPkhnEe6GA5Pg6k3L3BHqXukL5yd6SRtboelNVrEHBGksjomu
kpUIXSkjynVg7yFqhW4lyGYQhXWHyTQ0Cau94t7cPykAmosMq6uGl1vKJyoJ4laFnzFTXkB7ni+K
BNhT2upylgvoe7ANYh6nnQ57LNLlHBwQgaWw23OkUgw6xDFkZaXS+vzD2Oc3NbpeRUXwDccWZoFS
8PW7e96D5/hrHXD4drA9LBXC0lIhyuxXyIgiCgClgQjje6g8FaBlem4DIFI2KBMdKu5+RmpiwpNL
noi6AfISbsm3h7IW90O0YMl0xCF7UO+16UIVtBgPkgFcu7gmmmmhqCF3A0ljZEQoAzgQzmwypoQx
KDECGoYahIgJb3uVO1sRhPJDvc5k6EjmlEqSpFkOM3fDpB0sfqoOE9y9sdUMklyT5vI47anJBUDA
PFxQPQVNT7xfQw5GTJkyZMmgPJUKhhJ0VIk8Hp5jXCpCeyfHCycCqUBshyPwQM+AUJsraxD5tRT0
CFZZNE50Fr4iGZC5wEtQgL5Mh6XsT2tA0LASa1f3m+YTCxhKkYkfK2y+F8L5kbjVF+9hKlgPvo+B
CahPD3SE4QNiEB2CFbpG0elwehMmHGqspxc10kyngkVGqKqIaIWSzApCthQxcepoMjUknfKbJoJC
yfgPyly9gc6whLvAgawJpJUk8xwwMqlKidARoDSMyY0GA1sKEh7a3XqAK0yCaUSaFRZQKQ0vrcgE
mtrIgG/zJiE0Cet2PNXQD7uKFPgJ9L2Cpc+k2NRKgPNhqSlX8Lclt8tDrm2bDbMEkPcjwNvrR2I5
Me+eqEx5oGgQ2q5mEhggqEgU9onMhwv2JyIa6zIrqvQ2oWHLapyoQyKwueZCHpdb7UKwQtODw9Jy
N0q3Q52WhdKGbA98JR0CYtplp70OgQySNzzOjK0NTcHOagYQ1bUN+FKD3Hudut6XeyNQ8NrS2kMz
MIUjQFAEuWgqk1oV8iEmGYAstxNxtNzjdTrU1RwZuo2NOd0Lx1MvEc5bFQPMDoI3UIZT/tzvtnVO
smvjn5H+VPLryf+LuSKcKEgzXEJUAA==



