# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: joro@sun.com-20090921090422-jz8bdfmapgq48seg
# target_branch: file:///home/kgeorge/mysql/work/merge-pe/
# testament_sha1: 0f3ed7da771d3bfc3306b1d5da19cf21943bf4ad
# timestamp: 2009-09-21 12:07:56 +0300
# source_branch: file:///home/kgeorge/mysql/work/mysql-5.1-bugteam/
# base_revision_id: li-bing.song@sun.com-20090918080754-\
#   6pevpk7ublrwnl45
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeSYB8UAFJR/gFWwIABf9///
f+//8P////pgIo6Xeva5x4cU61Npj76rtLHpb26G13B3YzYmvu6XYbeu57udeh23fF2TKFRnnvPO
s60F7HW90btXtdYV0am3uMC7Y0Dayqo9267dudme491ZVbagJJAQRkDCaJqZpomTSnsinlP1Bohs
o09TEeTU0aAJQmgJkBJpoBKflT1M1PKA0GgPUANDQDQeoDU9EwSUQaZ6moZB6QAAAAAAAAACTUkT
QnpMKnmkynqfpT1M009SaaDTRpoaAGgaGRoAIpE0BNGmgQ01Mmp5ASeT0mibIm01AZHqaNDI00BU
ogENAJoANEBNohNR6gMmmjygHqPUAZqb6TBDJLFfyD4t888HucZHL+bKnyNxlypqLyioPh1dOY6u
Dgxu0Jd1Vfl3kxOtrpZTuYFJ/vclizSefzHp9HKP3P/P9cR3yxhL9CBVH9R+O7HdltoYluwdznMd
/7oLbmzrp9ITo5MWcfBf+jqtjmoz8tH0wOtR4OrbTB3yhf9nR8zt+431W269Da9NJqdWnQX53mMx
r698k9ZvpSFMBgGSDJdUcO7vsvdd+zna5yJDcHNF1ezUYycpvid6EOpn0X4ra36GxMLqpNszRp3U
NNshrIhU165KSjbukIS2yds9AuZawAGhAJvahmkogBwQ1ZNsSyGRqXtAlqMcVfCDxjSUZvaLstZb
LKy0tXnt7ttffub3rfH2d8Ugtn8/iliic8jsiYqbwXQyIZBKD4Nkflg9ABUZHvXwx7g9LKaH0J/I
5B9fGIHC+d+HFiKfeRBLgnhANsASKMYKCiqjIKDEFUF4jdq4/5kJ6/irsZoa86MVdUqzh1W3I1dd
d2eU4+mE2xM1qnGKZhaVvpjcMvSIQMjgy71GBNxEUgkwTGS0tLRgGGS8o6pZy5uWwmU5cQSwnBQT
dLOqYLFzgkhTANhchCkOtkNyxYpF0RaWi055Zam0hMfdpwHrwMg/7+w6xYr4nzFwed/5DzimS10a
k7l0p/niRBm8ArCnzly/Q5g5HIpsDOeYOPZaWDtxbqcUBI4GwrJL6zYYrvUadGUEyTCY+Q5mZhOH
rNVmMxYKa+J5jictQ1py9dku+gtPaeSM63Sg+Pv3JmRlctAc6z4JHJPi+Ukws6rCzFqINqRaBsks
3dTRc0xxgrXuTC02ihnXM3LWxHtQIOmmSUQVAFXCeEj4fVEN0y+0U6FbouEHKwzozh8ZsPCkTeex
WIpgSaQ5Ym2NUrrlN9DMxa+0vvRcmOZ0d6sMDKxZhi68D5jHjjO6G6CqgqiDBHdO5iBTew6QMdah
hYljBDMV59iacZ2sCFGzNYaeacXZcJjlNHgLXWMLA32jsxCHAIooIja7LtrDx2KI9otIUlsMt34X
98elG4PzHpMruSz6m6Af3CscCvgrSbtHMYAI2Cs0l4xdthUSLM0dRuVBZllCjcsn85xlfFxSZ3x6
kSJsIQJC62styWXQDSnwcTUxj2DD5qT6sToIqPPrOrt8/n9ljQbxf4yk6MGjy0/V2WVH3UaCFnrR
aiKLeVLzpPctx5TSbT3G450tcWTMijw1iVF07ahZtZ4dT0Ot3vsZ3EeVKTlKpqXz77Nmq2vLJ+76
VIyzbPGLZx+wuXjt5Ht6lQQS1csr1Q9qb+7RmDgjJBYjCRSACeQiDIqiiqKqgrnFg9wQ7Kd6H03W
Drx1nXa7kOcdQDBIr5zrIKHqCLzxIC8FNQDMyOIyz4O34Htkr7Bhg6TT57vR5tes9jG1s1C52weO
Yt96k2sKc1dEuy91bjgH2KEzOUDtv1kC88xDgVlLZuZ7woJm08x2vqfJ5Pv8ojrUn+Xk+R4lEYJY
2xZFCfCRGBhAahNBQ7FMzHvideQHpeEe4IVaG9v+kcalIipoR66E6dy468G7rIx0bZq2GSea03pb
PBKmKAbYDRRSSQQGVWnRgFUCno433SG6MGZgmypz5Xfq1vHTu+3HyxwrerZTFgdKcePTr4XTxX5d
HNjZeZppAolEzSIgQne9BkNZOOvls373ALHVQYNLWahXGjSAgmPnD4veQC6pPBM5s4aqqhVVVUBV
UTzQ4BJDP04V2n3bqURLtmXTDR0bue0rn6W1XdqyIBL2bkuZC5FBrhWuAeyVy3VcR+iwKyxpZMYS
2lyRNIIpGhDRFjyVipqVqKFEJMHOrCSLUNMhaxrz0MdF4xiuxpWLmKizTguVkjSwamhzY354RFYy
YLGhpX2fxYaoUriR0rlaUIrUWFCUrlhpq9BnUUCOZFkoVyHCQt5FtccMrb7JFtaK3FyopRIsqx0W
GGDAigSX2ikRFtCMWCFzW9yuEoyhL8tlNRS4xoWMygx9v8WAkVMiBQmOUOMzY6usmdAnSGZt2YeK
yiDPKs6s6WwXDCGM6pxAcIvgkTGNZkZ6q9lkxl6ypMUkClRtt9OSNCKkzOEGRJGEDm+yoCr2BwCH
dAmXHP0PrskrkMAcSO5TRdxyaVNshZYKRsYKs7azEV2ljBiRRDVDcTQgVeTVDik6WxDfD0I4xN46
DkVi3g3egxQhmmJZIYRAWrCF5CgtiAwaUpvOJkgJZjdU00JmhwKVMnRoVH0ZHesX4sMYGsbEfD1Q
Lk70wZVvcdBN1Tihs8kI8X6lRAgggGZeVjxziw7JTQVshthNFNAiGQgZWkymtZAsISk1OptceVj4
pGhxZM1LSKVcGh8N2K9emAjYaTEXPku4j0YCrbFeLLFrdTrYczyEdmywbGttHKh0EgS2gGM8ZXhy
wwE3ECqyNFBSvTekCxmbkZlAQsSIATMBCr/gUKZFRrG10EKnQhQzEK8w1wcBBHxqbGZYh5DDnGgh
kHoLUXausCEuUSsAbHEyCvdEGdkF8WAaR4ECsbRJIG4xYYnGaDnqdeZOIxqQqsqLkQYHTK4OPpF0
RCaTNiVNDIrERIoiJ3bDHWVPTg2IORyfzG5a3NLYtOzFasYsG1rWvdvPE/geQehINobJLtkq0imZ
I1BsDtRYPabNhuhoG4Sd5Ouup2kr99cuhAqxM8y9UK3RkQMXCMZkZCBZr9xXRCw8Bi5ij2Iwcqgk
1DxfJBTsPaGk9+4UxZRRU88sEy5oYoeeZMsRNxY0KFwiVfVjWzHZNyjTNTaVRetsY/sUXOLB4rHQ
xaZFyijSq2qN7Jkwe+Q2sm1uWMt+hcteRmFhxDiG5I6DVsPSFAdgXxEWuwdkzYmFWqEozicNxB1h
OpyKvTtQ9ZPovkUAzghVLJcjmGxAxCSAncZmlkMLGx4x7hRzckCFpuzR8EzNAeMiVtYpU1YuT1xZ
KJoegevyVjS9zlp7MalJcjVquRVB5Y1qIbuhhXpjAePo0Gc2BXWVplRIaI4dXF7myMMSOgyLSJiY
AisnZfe8zkxyzmkuKDWrTWslKSPhthNNze168XgucFHXsdbNsZ2vBMHUgVlBMwwSOYcDkaguNvYW
4kZ2OzR2q1EmaUnuLVBwYBVXdWDPnYZA2EKdmo1xIrPdA24G7bAyGjWRCJ26jyVMyXB2ORi2DoFC
qOVrMcDRFU3/o21wjBjXzkdrUtb6OgbexuarZtXL3k79zGbpkHAq0Ec3lJMyp3ijyN1OvWZRTUUx
onYnVOjxVjUQGKJpwRJSEDAjnI0qpsd/smXMgmaDJ2MnQ6F7WtbmtoaXukOqOveneb8XM11O1HlQ
4s5Bl1aDht2YM2178We/AhSYlFOfECgpJcZlUhOyt2iwuBZGFK5VGI0gDHiTLkM5QmPCaDCxkzHW
FaSOoMUeqxzJ9wdjkzqMGY2oaS8d55JU7yZwPFU8WRlQ5m+UN96zvEdBORQpvUqM0hU5F/OBAm7x
SPBoUtCKoCKZGRM2C4wxwaHpNrI5zNpZs2LNmzYLl7e9h0uqOloaiZUWESZhaG45G8B5qSO0NFd9
rVwc26BuHyfa0pXXdpOBQTXDgIRbdBBFsHHMnhcpGDil1WIypUCqklvkuCRLf4I3F1tNZN03Vkzi
TLppFpQ3odpNBLhAvXlryHNC5E5g7ynzqQdQx5SMl2tYv39tAbVrnqWrWxi3NzFYlXW8VG8z88nB
6zesb1XtLk3pPa0r3OPKN6ZFnJd7gG5YaLaxjNNoQyErrtoYbdmsZVRpq7vPCEAAPizQSC+h9BXS
Ex5w4QpmOQOXlYSXA6bZOgKlkIlimIDyBxEHNSRA9RN0mT0hIzgeQ5LWOux3kjRNXJSw+nVc03JZ
ClzI1hocU1gOKXNs5Vgy5w0rsXkvXLWhVxi+92tbYaXWRvb2toZjmxoKMThUEMd8hB3N2xukSatn
luSq28IODcKQMZVF4FpkTBOGBIAWgwhY4siwURFVBAJuYLuyKCGoxO1IGxuaGZkYsdehQc2FEvpD
U1LldhKCGCIgRLlouNALlSxiYgbUMFCw0rkKHIrA1J3kSInQYYoSDQqa9GJFQUicHIzNTMmbmZEs
YPZIqbFTxvHma1cRFlHd44EVyBUKjrTZ3mTC1MllscSM7JwUgbM0lQoDWLWdFlEGBWnPZIRo2KtP
XX5FFCcOxSA67RZnc8Bv1KQOhJgnSg53TWmxPvnmoj5NmSqyJH4xRJyaKUdfXXbie+KKqgMxIVCh
EURuBNjLSUpQUMZW9jBiiAgwSiCQgg3+IPjkYduHyyQ8EMYUWhlhaFw3KzNBhfLwRT3JsPzPqy3e
hk0Vu1/O+lsisr90qklkE2QPwbkxE3kGr8wrTyB7j8nqLAhLggfySStjJDJM+T8A7ElhEgxkEN0S
FMYsbH/Q9MAM+nAygp50+6MyCfMHomJLEzB5LpUNpLgNFqWBZFTq3OYP/oYmAH3H3rqTnCFbqBzp
uQvZBgtYYK/i/wckrCpK74pEREH6B+bdJhGt+9rmgq2MtOpDohRPzlst42RqaQ+JdRSmua4YltEv
ZuMnGPvi8vGYfE5tlVITpZYkx2n6GxvMnQgEwm7zYloSQ4qOhSNS2R+dFh+TGOSVYsTxbjFwXyYs
5MCxFlCXJ0n0ktnCOKULWZte1KjfxmM90LRqiZqTHOm60wbD824wXNK5DhMI3SS8rO86FGKdpsF4
yF8oUUi6URCTei1qKBAXsZBoCdhkZhIwZj1M216SBWaIpdT76bjqS9kVmBofoooql0wgVjNhWtWS
dQbS0NZWwZNwbNQYPD3SJ4heXoSLHi4SbAo3s0CbbMMiCw3GpJ3pajWn4j6UfjaioSu5kwQngamZ
YR9wtnq858II+fvcR3TAwYyS4IUSFMKBIBefb5a8Z8NQmcIiYZ80lgPFlvzhiUBiIsESZBCHB897
wsYiBXBvxgqfarVuFA8oOScmSfq+J7jYQKB3r6dI+iX4lwgVhAgfAce8PvPgWH4A4rD8jef1N/uC
x8xmZGwpoanzhmMZjcyhyHPm+fT6ElUXs7IHN+TY751ZuK9wdirk9xjSUSlB7u2jx1uRvcoHtwX3
yNCkZrKo3Mm1hGDWwPro/1RdDzKvj7jAPv+BtDaaA2G148R5ZW+sWN5nicSs0jFA2agXyim0vTxt
n09EptEkMlZF2gEz2ERgSXcYhH2+hd2YmWaEWI3GEi0bJnLj4Jj9qFkGQJzRsSFPClYZErnJwarg
3ltLXPP4WOiCFFDUxSdxmcPxu6/Z9iyfR6vmyYYfYWtFGL0YulR/swyU+DoWMOSMlVjWsXMH0XsW
LBa8SBgdEKyFoez2fIOXKHuLimZyNC1tz4gjmRjk+tkuWNDe3NxHu1pitWHbM2LRKxa/IpD5VX0c
4peozPAB3JqOKfVdZUbk5iD+MEREaDgfJGKex7qKfbEFss74fbXroskKeSz2PRVUsdrtZm5nHgvO
BWZOKxpWqMnmq0mDvL2iWslGli4T/6k4S4+yJLlXT6cGtoeDc9TTstbHLgUa1i/g8cFzq6X3Ly5o
XqPKHzmjOKdLwik2aELaJQ2VlY99gMCyL7nXALJPtOtk1MVbMy01BWXwUgaom7wt3b2iV10FP8IW
Ld8qiwVa1KJtpk6mEvhfA0F5i2X1a3xdzm9Hodzg8Hmmt5M1rYzbWxVhMXZm4olC9kx3pJqZt7GM
VWhRwaUkmuKpLGlVwUXrG50p48+8xa3Q4LGTW1tzi0qGZIXrND30z7wsXLbnPgp2DmDg0IFSIIao
EwTM8vtfe+Z2do9DbgUMXeb3DnN01JfhPrTtzVySBwTY63eavUxrrvpmGA0l1+GBgKXRv79S/ORf
SnucCKKXGKG1KcJCkS3KuAJp+h9g04WXOkJunQwWSDRKXg8/jDZ3VUFRMhQQU2O8U1OoYrm7v0Xl
mRE8pA6zacmOI46CJxKDUZrGy1Oz6XHZRa99xTr4TqjRvu8ppMS8uE7WNiUl5eTKTrLSgYxJHd20
HQXhv8mwOZDMkuCQrxHBKTcWBMyqplDTykkoMkkl4VzHEcom05DpmDChjx0VKUvUXGuo8jFy5W7H
fHa1nBc96HSmhPPanl6MVDzambnbrjlHQ0hpCg7YcRK4maBi67lPNb5UPHdJzVkWNv407ni6bK7i
Mq/DFzMVJPTpFIlEMVp5gOCzHoZdOZEhnljnMOBDJKpQeAnf7gn0YUBMsZxqIPAOEgkwE5knbjI0
jE48KwuZGc+WOS3d+ne6CySvGfsUNImTFIyvdHoKSiHsE3DtSMhSvjJGZWoSS2RBMTinOGdiwGCp
JmmBV57ZsNTFezLpCTWB26MbHFg2EBMVI7nYGRqTIM3YQQHvjktkVosp6iPNc73q2HxfN81JuOJe
+a5aaGT3quWqR1Gp6ufr7l+hTN72qODHHB6uDU1NTS0O5NTFRY9VlTVq9erW6FijovUN82k2tzFi
zanQuYqli9QwxSTgwYPgjN2wnVHTE6hSbXD+IJnb4gTdtQbOwadwdjTp3AkK5R8o4HtHGQ8qzGT3
tdZFe+LliOl2FW9DW9C5wxLioVyLLBlxGEQEwJ4h6TjraDQKpaNnwXw+B4N6MpkQpGT9qRg5Jjgo
pSkIwV+KkqOU2pdyK3HyjmWY6P+C1w2PZIz5fw4EXu+QundqPpGZb8jRIyL8ydSUUNfMR1vKInM9
ZJZyCpJpNegPWGKefsOCL2OKEqnwdB8PC+S9fHt/lc3oi7yL4ffCMELNeVz5n7ICVE2eEU8idIVl
BviwQvJOrcFkxOAYJsETkFSnlfdsVbbzCuxPT3dsOAjYqlUc8oQC1GKNySS4EiVzFYjQa2Xqb6Ql
6YN52O6zM1RxNsbthB7TI2pNcol4IegOH1kREqb8A55qQ58ufYKYdwr2bfKPttZzXbhM+uoVn4ee
TlupmbNIUQ496bkmlxWupNwECjHedIdihY7yCGEiBj4zHnUXzFHrIO838cLgmdMOu0p2pBQfs8GI
9pz2XEG4E6ukf1e/ec+s8Ujqen5Hn6vmUrP66rBSLCipSsoqig6X3a02uZwOPQR5u5i7qj7GPY4P
t5jt+c2nbVx3SNQPm98kmGg7J0HJLW+UNh4tptbUxpxpY8Ylq4VWlNDBOoUwlCOieJ1NW8wYpk0p
KIoomj2n6H7Zs1of4yh8G/KG9z1npHfSShFIoolsqRjKIlgxcx87W8OH2T06RLertXtJAQkl4LY0
MjEn0mgHVjADIZLsDqo9wx4sukrZyNAjgbhLArYVss1QyinZJdFZcdZ7DBOLmsjzLeduUpBlJdob
TcGtVX2jILg2SLwSSnPBw8hwm1g65PMdwSTe4IvfvauDnr7CwUoYZJ3pYlCE1h7HzJN8wblNCSUx
59bemKD1huUtNsg7ioilaHsNZt4C4oftx+of+fWqkL0mzFhm+9tn74T5iZ0MwkwSSK6ywn1wnBVG
Eo93DYcA5JWoODFmYLCUg9aQcK9STDWYzftKSaKsAQV3p1N+2ilUFkKLKJMhWwhhJhPpSUJRLEsa
ynI93AD5D6A0FcWw6kwyWjozAgSOqBmG1POalPnDeGKmengkXDudUISYVN8KygFMTTQqV1dhwHTr
D6ekJWQe0A+6MjwVotUlnusVlkwpLL2HJYRgfCRWcoCkUhUNSYogHh+YcSitXAtl/kRnFWj7WEzF
Z6u2ZaUbEURdBJyMqyW7ovUVo10bqAnKSDwS72UFcX5D2YNXvoddukIIdJIBl9EevwwfbWaND5dr
oEwTl7oCSWQkiEYiNCray4hfonJaT2m+AwZbkaI8qIq/CMp6dFe7+d7Pa7AzJMbLAxxb6bzUH8oS
Qv4F8iab3rPVM1mgga/otWW0fqSNxJPkdW5hqYxo3c6SiKUCmBAp2J7U9grMI4JmHgTm5GhBmJ58
/FAeopZyRPrH0PKR8n2EfE8jXo7xsOsdoeDkHCpC32f9uM7b1LSDinEGFoU9AyC6AkGQyfDAcVek
vSR4gSanSn2PgNqb7DnCsOaoQbjep50xE3PM5pkSqBhhIOiUoCFgQERBk9gRSToludtEWMGVsqST
IdpFZI2hvknpnukaQsZZncXuR1schl+C+lwaKEmLgVkBP6mAJm49JtkepCj2pRJAnakIWSczeZHE
rqzVWdB9VnJhdO1kYliSsiSyCqkPR2KVIASvE6BMNHWbAHAVyWqCeGHIbQRC4NmnhNVG8LpPGMWC
CCRi7X2l8sFqKKJN7JUTuHvVtXRfFK0g9Mh1bHVCJg8IH2uIXOpUeuLpusJBUUuINUM9BG2EpuSt
poy3+Xk02y5sx25A8Zwwy2ziOuZpnhLxIWPGX/MehPMjyz27Mx0mQWGwE03ZPbKdflnz6MKwPSZr
+BNW1BsUd81uNl5htUWwFzcpEwk8uahU/Beumo+Mz8TrsfuR0OuxJK5MXRwwJ3RERjERERETjoov
JjiZJBmRLy0MiUIWAL5J0ZgrjEhUkUFa7ShNL7321WAlKmkGcFirFeNYbisLZie9VG23qHD6nR8p
8tzfG0PIZHcePaVmdlZVWwSC2RBhidJFB1JnjCpCFakDtSJqtx6FRgqkArxqrhVLzExKLVV7Gi/H
TWS6iUbJ0cET/SfvTy41fun11Ud9XqUOObnHGOSOluSdGBFYtu6RFiYy2KzTuHJLS0mVZ0UlWMUL
cwYiwUlWd8mZIOlHQRWfagy9+pKBs1OAQ9HxjcbM89FB3VWq6IBZQFkDJheUHmUqy2iYRESVa13j
mYqdDnPErIxbtFdUKLCu84oZgEZq7n9WB00pBDdIOnnkbdUytScCs02XWSyOI4mKTbppSTE7jlF5
9p9xwkdPefYjt7T2Ds+7dqRqxSzrP8IeEOtuqYu08FOMlIdlKO51PqCpVGmP1sdB8Gl14StN/GPa
ddzQsHZF0+6XGRzPqXlClOxHFm8j2HaYTY2Tzl3gu1yTUwj3B0DK5DFWG8swDkKeUOS+FOoNeHI6
2qRJ5pcWpFg3ufsMke7NRGbaijGveLXz1hpWHBIO4Jo6kU3+raWT5CedvChAZBBBnXLqhoc4Hkm9
DNlpoboYMBsHwdKhFwdTru5y/xSbTbN1ZanoYSFi8olYp5pRJHsLxMMeNyxIevEI3LKEgrWUzV3F
N1xXPQyTSFuUmf8aXDuZOL2W0ePvNRmnK55wzRnFDZec5I4OljLzo6utNEambXHleRjwbOCw5Rpo
RYlO6OuQ+aMmuOLeZHVtixKGmOLuPaYRlIYdCUNB5T/8XckU4UJDkmAfFA==



