# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20090906234303-\
#   5rlxknktpj5xjhcv
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-45292/mysql-5.1-bugteam/
# testament_sha1: e8697c95cef832b810b80cf6ecdff80538d26ea8
# timestamp: 2009-09-07 00:43:11 +0100
# base_revision_id: joro@sun.com-20090902122232-z3wm0h4s3hpqx86p
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQRVfXgAFP1/gH94O1h/////
/+//7v////5gIN7xz7Y7ZnGPd3KEqnHm1nWHu2uWd3vcV60FOvQ3bRqdnd4HpQFtl7N57djds9jp
iPPN7ap2W1LWmm965d72zt3el0uzY3RruvRrt3clRVKvhJIRMjJo0m0R6ZTCanpGJiYk9RsoG1Bt
QGmgD1AADQJQTQEJoCnoaRlT0PSRvVNqMIBoBoGgAA0ABpoOGgGgANAaA0AAADTRpoAyAAAaNMgw
k1EhNJplMQU8m0U8k/Uj9KNPBCfqg9IDQ8oaDQABppoD1BFIJojTU2gTKbRGibSp+Kn5NR5GpoIP
U08moP1IxpoAjGho0CRIQJkaDRNNGiaPTRGmiJk9U/VP1TIekyHqY1MgBoZAyPJOe48QBCiQCowC
hi/QHcHdX6yfqafmkYJ5ekS564MWTzM/YAwh8G2iafuZ5/OOzLq4cdD6+Fc2ai5ZNXgqPI1iODgU
jPj/2fJ/X5fl5vrcfY28R6O5hx2j5DTm5067n1f25wywdl99NTkcrmsowlmibmqDIhMiGhxferLh
JGWxNiNI/7fvXZSXns5Ty56RH0U1QxXFbNp7x89FPIqszsDDFbHI/wrUUIZt2hdb5/dIqa0jidHL
RdG3q6OWXc62FaL2WdHTLrf1O7N35ao5t2mXLpuN2kzVvhS08l8cxnskM7Ls0RbzpaaPRHRCs81B
HQVUH7nPiRDTuzyz0HtpqqyAf0OEk02bshWelAhQdEkhBZdf74xj0I4OzIqQrXfCvyfP1I3utVQR
7LdYYkG8bNjGxiuraLRZrC54BpTnuZnf8+/rspjqxmuokZzCcbYaQzhGCNKkgwBHXQ3mutdbTPTt
Wam1dTXEMKhtZSltxvMiQIYsI2FVRFM2iVZWfKFYuz4lNS46RlUajM2URSh8WkVz5qUVVVUl1jew
7Eb+ocmgiB4eGkltlKVAUDJhVQgVAgIRYhp7JARCJf4J93PlY+PVIvvQdyKzVLdimP9KFaf6np9D
Nko/xAj5hSQwjMR0eyDsYqmXuDMYiRn6N3P9DOaO2/sO1jghw9SHC7AzHkgsF6kNjBtADabQ2fXp
P6mcGgykH/oI588dJM1B4dNN6+3mCtgtaovD12iJlvXd3WtGppJ6SAV52tmiDSlWsmu6VWJMIXZm
fR4lETvE5zZCkmLSWb2WhNgZQdaVKWeRJZrRTBk1JNJ2St2SqxhlhxBrt6PLTWqKkj0YsoZo3CKs
jKHx5U/lI4s53JDloApKogStFj1KXBRfwp8J4rGSmVxpvVP0kSyJHkBRF+FX5RmsChGPvqs3MxHz
ZbOeWM/IvQbp77TvIVr+KxT2+NZPh3rOwKcnzdo+OVAJTx8rTYi5FIRea5BZJj+EsOQCLB+uOZnv
2y2280UEQvKKPl7hItk2X6rPjbR6gWxIrJ7d+tjJSOJF6V9L55sNeWg/poU3Evi003DEpQ3WqSIq
yKrOh1qElRldenu7r7w26AxxqczeHVuGxhkEDZteuSqCqzHhjPc2m3PkudipJmVETcpON7Oietzr
ls5FMuNDO6ZKNGSydsQvMdceTqmUW5VnskjO4LjdxQ5WQGpvUPaGVoM4Iqqd4lxEbhQHj3Ns9hIA
8gD5gVAPMMTY9AX2NnaHRrpFDUdI2KK7Y+20LE04PInYsxZSFFEL91B52Fmw/cmcE+yZs5KRTpqB
dXZUaRriDaQ8WX1KKrtGgnd6jTgI1YlQczE+FENsrm02VTX2lfE9qCzsq2cqNb1zvA/iMagHKzFq
zQ5ZYTpTQNx3WTCtlbipRQnCgnKTGdzsN2mll3KuKimqU8M5RIie8aMjGIrV8BoozIKWjxwePwNz
Z+fPCKm+ye+eD+qy8+iK56Whs7ziTbYDwJMI+k98czkOQXMWKXpbgsqvpHwdcfFtSeXF2UcM8wcu
xjqNc83JA3Ye4Bc9OXBY6G3Hjr8/rEoxziQ2nYjei4kM0ImIwheFVgoqw2+D3suKQ9miHxMbAr2S
oUF4kKCFfctVVERFVVVfsVCpAJ8w/5j5CgVg+uEKFizENXHq6YiPUV2BYAc2WQvZc9e2B5ETdGp3
eYPHCYay6F1H+98CZfrEMl7V2ARWZk29KcRBXZP0PmOjS8ChqmBN+r7CVrhTJXe3ZXudfTOm+Ydq
Tsvz9tYHJyQ6m9ftpfBvu16HI4qu0odK0cKJr3PLpjSti8NK2ZPQOaWz3TYmVefP2vCaWWwzr6Wa
tlFFMbMndkrOMJPJstUyynXkB6Q5vmCQCkh0FUEh4jAiKjERFimMbbYxjPzfZ1ySyEjYb79mmh0f
PWV9FEWTKTjVEB6XQqnKkG6XAe1q19lHUSdgGEsGSrpnlNMpBndDMRLvsIkqrpblOt0Ei686TgcD
2H0HxPQdAJdQCRyO8GbvYSIDp8wIBgjMvYGT0IR6Q9sjcFVEWBIVIxDdFD/MVc4U3bjK4TkG7MiR
kVREmDV425JY9HZrq/Vj3bdI6W0dJKSj4arLQ11QVTglZDaJe3rAFxaTaGwdqQhLo2dVlO2lIw1h
1bktEoJEjB5wgx4BTgpe2agVvRqgo0AVoCoyFPXAvEWrx8fGW1oM264Dx8sPH5kGIiAgJGRIkYgw
GAkEBASJEGCQmPVzSFUGYGJD2sQnAEhL8/f6ec+E+3ShdjRRoCjUDRyYqmlRtl0DFZHqYVkCi2uq
RMFFzV8MAqP81MQxL6oJcpLyUmEwnRSUnEEgJDUYLqzvnMoyTGIJ4KEFUBKqiqpOUkJTFsKZWoYu
KBHDCTGcKkNYF7gctTgJ0m0iN6la/XrxzfLwOSJWYeBa9A57jCwPGTsLqW0ZWCNTb2U27mV3CKrs
LyW8bGcyuGkY3y3u0Gw0GUzYv6K0FE02HOaNJLBDFceJODCRUy9mc6Zdi9NktPelsMAZqni21sxR
3+0gXMjWZNdrbXfU2Qn4wwyUVMgcZN3CnAMeXFKhxNJSMrBk/MMF8ye8uTFrSOBgcgJGsuMs5VUh
PSG8YeflT3/ipoDg3B3EXaJ3uw+9XHOxjpvbb3nRU5vzPI+J4Exp3naaH0FBE1KZOqXQ9/PIpcyG
GnR3jmYHGdr9tcqJdMAhMNpBR0MKOvQsSPVLUmXUmKCqV01JC7JV1GI6JTdu9lUlc6pl8lMFtG0a
C+wwPUa953Gg5kZpUFp7HVwloidq6ij7mHEtuly0jbDJ2oWlMbhcHy1c6GwfsAToaX2ZKCDGwJgp
RjWUuJIG6/g37aJEybcxb5MFBSrsKqqVBCBgUYZYYI9YahQlkSe2g9pVH4dRMrllfTskZFkK3TMM
xsTMjLiJyNhuNddgaFTcbzMkbw9Q9KdoeZt9J+9dG7JujT4xp0Rv1cenZKG3XsqkVmaL+nDicS/F
yw9UBlHyXIVzB1KQ5NoBDrJMRwGufA3nF8C8cDG03EiUjBlaNLTqGetZU1NTI8qBwCYmY3N6jdoM
JiN0qOALTf2DGkhuHmLaToUfQ+upBgZqBr+WIZ46dcVl2xLtpKK3AOfqqxqTTsnnkZJnor0R07l9
8000cF7zo9jM1GaHcDdW6jCKa6VbRZxc/SJncLG/XkStg0MG7zGDQKz3nkkED8kDzEEzeUMy45M7
j2TqjxMjYCGw98EOzPPUE0WTGzhHPdWfGyCVlqVS06aLYkQQVIGCrOhzaTggtHrpUU+TwNKk5vVy
o3I6y98N3F9g5lobnsRoTTmRRhwOkEYgIjIV11jzDLISjg0OOYtNRrxmipO3A0nA7g2IDJlc9FTO
Gijq4cSlloZEp0uOkWRSS62wd4dvzKlCC2poWzFdIJ9tdry9NRjxDUQ3iby3JkLhpKCkgXjX39hn
M94zEDkNGsnDTqsxoLKamgOz0XpNBcyUvIToHb6rdsyOsOZGJT1HBiR6Q6qvM1dHJ9YdDzpMwY7q
dqMeHBMFCot7cgY4m48wpYva9ULs0OrGcn87wrm2g1K2zcuFAdgUGgVgwgaQnA6VkS3bplp4hTPn
sppNJfOYwYJFnoVZDga02xIsbU6jImZGBzBIc3FQ6jcZjI7y7j65aUjYwzsPqBY7JzlLdqKSQSRi
IYqqIKackiz7vidTscmEm20Z18hr4ESEad/75TSQ7OVRTYnt3QqmiHouj4eOnn6avPFauuynzsiS
Dh3+dENl0rNNoqbhrFDKiuqy2vw6uvqnz71nto/Xuk81etuOCdAKBRKFQKiWC5tNRN+9x0ydcrqT
C9wDWcfqHIyF8zHdLmaTzEG1tB1juON1ecSIODqYxjoMhlO8CwmpxANttJYhTZ+ID3bonaZhZSU6
f40P/rt83xXxlr3MwT5A/cMIid0fgH6lCR/x+IJH8ERK3Fj0B9Ju1n+/vBh2vGGEIiHJT6Q8VRDV
8oVH+JcNiomJjciJ7vmmB99lDIvBE7lIwI2IibPdwJTD6gpxCCUQUCJcgwcLH9QJlTSn5013EVMU
vUshoAoEhSikCMmoE1NBhhtA9yzD3RbefWbwocE13oRWAggUc5Ek5DUD4EOUDkhkBQTM2CnRTvAA
3MgQ/qpxuCSIl4bDwH6zUjf1Q4DepAEIyU2EB9YbmS/UACwpDR6wMhmcEkE7dob4ICMEECCBMiew
CRAHSld4hYsA1JIyLj58AsZpuUR7xAkUUpZVSAjapq4l4cQh4JveTkcjWpioaSMwOGqYHu3DkbwN
1wpcFBSYpMPUpvER03ClxsJhImp4G2G46AKiME7EJKGoTFE0hBOQYqb3aBUuAuAuJDxjBmpLHN5f
vnQgiNQGoDrUN7rAuQ2KdAwEucYJBkB2qbl1sAC8PHs7uwbvwnKQ75u7qMIQxaA2BQYM4LCoJIhc
DYkMM2PtISR9CQ0N3+RiHmImJdvvl5z+6xZbFlPxqPwoSJ32WSSC1iFAJKlKAYsA6g88ApBPVvDM
45oUAyZxBSRQFkZtRFRNoZLLkJkaabrNkgmm18xpcQyLiaP4WiRhJGsSNJJKlmpU0jUQmhRUHkyI
WnMQ1mjQSCqhSqisBofAZ6GhWQbgs+Ga8WWktjUhkF6qIxBiKiK6cUOMwcDLm8H5dtw8QgYZqQNp
vPSek9XxUaH5D5T/k0mQpjdfgYEzYpZC8jWGzpE6twdZdQUnYe8EpjGvsYfk7Sk3SacQDjCkdN9F
iRoQpeydi/oPQO9EWTX9eLtOUQwEq0WBVqxzZ0kjfwapGkGmVsPkzgE0TSRlE2Hi9bNm+hAI3Wrt
/CjOga9RAnZzx0yICJCBA8bgF3axzUQDRHQm0s5pIeA73LtLXDDaEBhJbRLNuy5ooWD06GVoNDCr
CtH1kz5d5UczwPznrNZBQMTmHYbCsmH2FxqDSHEl43FwXlQoqO7ZO0BPYgEBECPJqOqY2QlpNJZa
hcMri49r/bEN/ySlZC7Wd46Pm9FjiKRsjoh7Fc01ijS5SlHn78x4qCEMxXcKuQeYi7dKCUxEQ8lL
CMtMxKVh9pshbAhpInsLi85iV5gZZGRZb736klUEvFTZfzK91b9YdUJgXCSb1U2WsVoy0SKUCsgC
unWK3tgYuU2DJTrvk/ygO2C8UhOWAHZNK/0BgZgYGYGGYYZhhmGGYYZjAIEgY/DqK0IWJqiL4PEE
U4yxBmtPcMktkCgGKb6HIY3Y/tEjtAgLBJ7q+49BgaDaziW4HYMRYULhFpNngXGBhQxBEAoSaEzA
HQIyrz74hHNvEZaaSaPiwhM7MAZCcSJR9GExlDi9Zm4GdxOYAWsECkWHA0szUWKCos910B0E9Q3Q
9RRSTSNZq1R2q7qbI0QQ1DqYheQqbEJfNpN/AnLQDOvHLrKKqlgraQzoMgLdUM0dJLJESQESkKRl
6SYJF2aLuaGhdwvRkbKEcosTwtiYzKhm5akYxS8XvediJmzrqIbAguMkF9vulT+4oYE0VDYh1YWT
SmnNbnBJDK6QiVBgdJZFzKDram0G9JeHZouuPadZbwu6K459eFDyLhlcHIoWa8wo2Iya2IOo46g3
NE4EpjUUdA4ywuMUWXCSJQxEUagUBQgoKRSMgsqENW+6QqQoRs0tBZHfmVoFZSUTadBwNYp61O4k
eQ24qdwIak+PFQqpmplOaLGk6M+MvBt4VCmDMiRj2QVRBJoVBKxm21ZunBIO77rincEEDuQKEhc4
MXwsHFGC4t3oOburezTmM4Ze44p0dsYswWtXBtjCEO+pswL88zrDdha6yHXpdy7BgIkUB2lS0bJn
KdzZWkODU4kiEgAJ/qnbMSWZdYbnAOuMDPZ796+2P2bU+fkr8NaJH0Tcg0o6vWpvQ7+zqyce6UEv
B8B8WWuhPhmg3MFmKrCJBcgUoQKV1KEkmnds2neZUV09QOpQxhEIUgE4Qgt0lIb0VgN/xKWLIGro
cwHwEdhJX5qLinmTxhUIj0ieY5DqNQ88nmNhg94OIyh3kDWYqMhMuOJ/LeYGJnLTQZkiogxVSDtI
F3B0i0DSQxf7AMPBqTYkcF1QEhdCdTczArKwuEkuBUCICCX+/fZ3jdoCTSfaG4PP3jtFbhxNCDJJ
kBpxl7/UeRU6BbwF8cdRyvFAMbQ2wY2hDXI71ABKEc+ZV5ilaqkJAqaFNlPeMEbgqSRGkMDSHjOL
uRgWyBtV3KwxDX97rURoAtYYMEee2c/SFx5GW3vJ7gRJh3QycvvqoykCVQwSsKn5J9wUTlCwoEx+
AEjUeckinyQKOZDPv1P0Hkyyzpuj3OULJZhUZekkh4cstDoMWbdZvJx5lQkHvcIZcnw9qp4TGK1u
yp5TnhV7PAEeOb6dVywMDYenlC5OScRDgcNiPvlEFa9wet7cszFSnlH0wCwQQR8kCygFQ9AQhygJ
Fzu5634IdsJIVFuUgQOEdJCnnVqAaZSG0MYzAEJ5buSCAhGSHkwitoe+vtigVKNckvjRglRHvh72
d3KApkeKPEFVKhz4SS3Hy2Md6Bm6Bg2+vZPQqWCX8o+xq6oRGDYlz5Gs16/nhmw7Nt6qTY0m2On0
HRRJTX0ZnWjAAOib1O4YcZEOYXFUlYK5xuO0yPG9wA1RGsEXicEeE6JjTpJIy9ToMHDLWKyvUSqo
PEx5OPeiFyncJqCDFOcYPc9/qBCQaHAsm80ZhghCUSDkD6zECx4jp05F9+5SRzGYwk8zyMGlGx7D
vnaYC54BshVIIVGUAXkCAjogpYsyGOjuB2eDpB+e4iFAdkqLFWBQvUbQihJoNQdShJb0ej4DZM9i
G0DbDmPQnQn0oanbPvJT8b/0uUzyGpsheEC1EIJqd4s6KgNoU9oQ9MgBw7ZwoE/V2WgiYwsclklo
kvcrTwPWUCrnmW07hf2DAgaTBMBjEwGRBIkoqSojEFgMAoohUQGESCAkQQEQSMiIjQyE7ZYSRPjY
NlU0XeogheTW9yCRRGjceOgMZGKx9MLSkxdW7zSM29BhmKylgQDVobteTBe3Odn3eixnS5wdTh3f
H+x+PaRZkjj4xY8VWVhh7uV5kGTyCZw8uNxBakKEr1lEzLh0mUwyEJOcJEFJdnwHKpWqEWkwEpQS
U7xwIFYUiJqbWSeWdSbNJveLOAYDEibecxIWYDOwyGEAKGFIm3wgQ+1RPYQ7STQECr4WmwiBWEwS
Jb9YTiipIPunmBPimgZTPtkgErDMYxBnaRwdfhvvCsLUtF+aIEwGMhIiE/HIkK6jSV7irwxM+kl9
zj6lUht5VSUIfHB6bpAUslIS4UhAn7DtCZPcwVWyfeL6p0spdqRyyOKkMfr3XlwAgv/J0iWIe8SW
LWgQhuswU8dESSRviU5lx4GL7huU1Eq2Dx2zrHvUgXOKTmgbdESUgkpmUZoPbC/CzC334Uc0LXhB
0a85xHzqd83g9BjK/yLh+DMzA6PR1K6Rv0NFRUBHmYZj/JVwMOXHyr5LUrvXOJJpGgSPVuNvajj4
Ay4vE4Dw9OgQ/J90iBE91BWqTacYUihKNgCoKw9XOCHJF1XqhxJwmAqODkkRcRapAkFIeVjLlGs4
BsSvK2YJQJTfV5CMyeLbOUuozlqc5Gz5TwnJENZ5qhipx3G+jlPIqwASiDfKUIq2KMMWFlzlSAAc
bT3QZ7pwHnshYC9IiEIIFpUJqX5+RUmXPjRGF1K2vq30JxIqNJkAPWYZ4KJqUk8WOWWN91Roqen7
H2q1TI6ALQDMwJdZcJU4B61PUN+J4DVLADUyfeVSQi/tZKGVY0IkigWtDrTcjyyrxgmihVZEvEHB
wchkn+QWdSWNHsJhcC8jaKsN+TG7H2kbAKALOyAQNWZ0KAGpDq3rmDebpRJ7WVBMaS6ogli1RC24
VdwSXzARaOlsY0lNziPjOYTTn/GyuQgKSXgNDrNgdXBywuYu+c7yoqYFuqYQyMiPrGZMXMt8VZ0B
MtS2jErLBlhEzQumnzgO7SYkMtZL/nHnmQrDxTaYj5/M7h3AK4Em0CsQcEFpj2xnkDEpGj11IXI7
MgLSGKYSOPhMbokvQB4VRVVd/XMB9OZwfo+Ke+WQMzrIKHLEhsjWppE2ZQHexVCYYO/ZCRsUmSuJ
KqE0CATpcp2f21n28sAAOTeGI+gF0TDymUjUePvEhza7TkxQGFeXn38MTJkFu7hgv8ZANK1S1R1Y
yGGTTEUxBXiw80Q9SyqwEid7FBZrQgYyZQwsxP5zyYebOtg/MgLr344SNBjAjVnzCqprJCQe00DI
uzIoAUCtVLrGmuZTpiaJDphtAwyMMaKNGFQgi+AlGl07lJ2GY5BmR4NCQBEJIoTENnITNIYAoAI9
hf3ZzQypLewQv83sbYpM9YSw2mxIos4p4hWZE00bkCSQez2eZTPQpphHFYOXmkOo/w0ntOnS9DSH
mXkCPaDCfVNZpBA4gAhJJMiC0CfZDfv0VOwb5GpOervmkzXLWZmF6vzRhmXfEpLkA7OkkUbVCh+j
I8NBwgFyNVgOcbFNcBtGAX98Dhgl7YAm6jsUSSmzF6fMGJmHjagXhs6XcCwFcTPSG88Lj5HyrBWD
ArJGJk1dHUQcYUmG07MWDgjDRiE2+i0/HVXiRMn5HyJk2JmRt7ZhahaRF51EJa3amghxog6ji+3x
lGvlJFxGRePnJZCByhUcDpzZqm9gQIIFruKk1APSCdJuBLHgOzKwrmaSfM12sBsG/QMML4QtzKDo
yxik0bbgq/1UpuBhNcmUBoDq1V7yccE7bxTw5k5N23dhs7oEmNcN1tXZZcWQaD2YgfBH0nwn9qVA
UUChSZKaM8XckU4UJAEVX14A



