# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alfranio.correia@sun.com-20090718201035-\ # r23adcgmw2doubv2 # target_branch: file:///home/acorreia/workspace.sun/repository.mysql\ # /bzrwork/bug-46129/mysql-pe/ # testament_sha1: 56e8266bbde17573ecc8c9c408e9337bd3cf8d44 # timestamp: 2009-07-18 21:11:54 +0100 # source_branch: file:///home/acorreia/workspace.sun/repository.mysql\ # /bzrwork/bug-46129/mysql-5.1-bugteam/ # base_revision_id: dao-gang.qu@sun.com-20090717050310-\ # syzzfuwr9renvktu # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeEH+ssABr9fgHcwfff//3/v /sD////+YA1fVvDNXbtuuWokkgVjLMShWgJUG2qtbZkTZsNTJTyRP01CHpDE0YT01MnqPSYIYQZB kGmmmjJoJJE0xT0AKbVT0n6p6eqek0abQjan6SNDT0mDSAaaD0Qc0aNDTCAaYE00AZDQxAGjEaGC MgAkU0homppppPTaI00p+iT2pinqPIID1GT1GhoBkG1BzRo0NMIBpgTTQBkNDEAaMRoYIyACSIQa Ag0BNTyE9DU000p5NINqGajCbUAAaVBqGQwJgR/sPkDBeBtBMCW/r6uT8e4+jmcNE6WxYWREWbP4 gmiTLDSdG0bA1uSB/+KMr4z+s3YFxFWTHqs9mNdV+njAN4qBMLvGT664VGfzh6dFzTSnc6W5ixrI OTM13Z3+yCD+8ScotNp4UmQhGg0HOdXuC0Cqv9PGkhFwkmw0kf2ZDfyhM7fOH7lMUvd7DuCWOA8y X8BgDQ2NobBtBiOH2oOHB158eaC2GPZ76VWMXHpshjuiQ2REtVLbLbb3ddbxtyJxU2GcJ0nLjpCs tlFVC+feUlRlJRS22sdJKdWAXBwnV/h6/aeRlI6+Xj7tRvDgqfUDfUFgTDjSx3eTs/+Z5iZGDQcz 6I5WTg7tPwshiReiscfyeerCidh2N31D94YwvYrGWybi649/h+cH3v09IUnhDhRSgclDuP1lWW6O ztKRJ4FCpn1fOspCVesqgO1UGm+mkHocNzAw8Wptk8u2aBbxhKgDWFrbz4NzVW6WNK8bSHG6wJaS rZslTlOBxZoKUTEsRO6qCDv96DEMEMNjs10xGCxLfEUjdFkc6db91fg157GcuqhHzLPnwEEpSOhE 1sg/OwtjAvrBB8vWMUzoTGNHfxElhuDkHq9XbyzIe6M7fD4TvqVAiqrkSURmTzYbInlhDAQGJBgW LpOmx2tuMXKgeSHBJ6+q/4iVR4h3HwDkJKJWW+T9LxRBdZ6z4zzesdYBAJHQUJLwCuCBtXQihlbq 3RFz3fKogthNr4VFSTBcyQsQFMsiNJZ6Bv0pctoKPCtO7r7RFXYdT3hLTmLgNrShpb7VTF4mitzz 1EHCnISlMkJXHzgoNIVExLAYgJ1imECvCTGKxMKUiwtrVrCkOICMhKiIuZAmJbQcQEwiKPi5ChIo QKy4qHHRylo3aEvQCbLRBmwWszO2LEWvzDha8aomkpT1lAPUziGwuH/CkInMUNSvW/ibBpT7Btu2 z2D8Xq+pm4isMRY+iJEzDEv2FTJTZOaiaeQ4nUsjEM9MoAirfSos2g/ItMyO0qE8Y94QLx48TzzB TmML8sNMTbFQGyJCTCAYXAStNWy5Vlc7LqYyuWc0ip10NM2QHGGWq20iRpNkBTPyUkEjeGoWk9Bi Fh2YVa7hEqVKLZ7I41hlAHMpG7OpG5rFzBU9h4Vg9zNKQqOrNTcFYVDQHFhgTOlTFAgVEA4w5RLE wCwwwmaFK3aNItMINyJxFWMPJyZnwMSgckQLvBNSxEOqR8iSq2FhXZsuf0OuArzJhzQYmg8h/Ahx qHcMHQx2OZ8nNDQe/OmAawSvGwgq6YxrzI/HebzANCB252CW21UJmr1kNEay4cO0CbyhcXG4054E SJkX2EWbTES0Bok+A5dVEpExBVjW2vUFWIWYTLS0uJF5B4zN5HOSRNKBmCRIznYROWoNdqftKKcL y13shrUgiswpGLglRpXpI9CkqKbSASnESsgQ4JnY1NkBeYyIFh25LLQRobPfoI4myIncgXvAERGy coN27PWWF5vLNxeQM5e5cJaTUazeW6C179F2gqawJA44gIl1LFC8X11QLCUHs00+YYjohgOJPoTs oGVhEiGwkVneYEjjzUlpxUmU0ZoGkhWmFECUBUoJZHmp7ZSOi/wDBGjb9AdMSEvWNGkCsuO42HBR tDqBqo15ExsqGMYxgUPgPOLpPKQVkibLBkEziFTWHQHUpAjl8PwB0Md3iGxsYNt/z6QrgatLx/tW HteQPaH9Bw/wOkOswvPWZo6x9h/oPRapFzDQQ7q9wWV+8OpF9QexFdfXxl9g61hiKGRmRNzgLay5 URWHsuWP9sgXBeYATkF+r3kQWrSwb2vLwoDB5A28L6qi/c9RtQ4VsjTi4Zg146FtwHj8kvkfeeoO xh+iUDyBkJ4+86BVFeP8aSJIDwExxKITJh1QDMXiGSHHnOc+8vF+AwvMXHV0kw85BeUccRcAo1rB hXlPKpfcyNEiFgqZDziuEqw2oO9keMMErfYeo8h4RMnJhybbz/uzYydz7DVdpLhbDMUnsbsW4Igl SyQR608Yfr0gEpkfwGob5IB0MEhr/vpvFBU/dwHuPdUkSOR1jmh1FRsKjl0G9YOO0XXMEis+bt3K 42Ej0guG57MbxG8VLkB84cTpWemj7RMTADULgYMazE8Sw4F45kQLLGH9Tm87RdRl6DObjQXmcXHu vGuWssVzuKI11BAooACh1vF+JEBTqKq0jM0ICZhTBhwdh0x2k2A1BBaziatp6yJ1wJpEgJDhiiAh MKjk5B2ZQ2F4t/MfCR3EMg7p1khVCy6dJq4XzoNG212cNz1MHJiSGP3URM1pRTyeokzfhXSt+l2R zlYVm3qwOQiOCIes4ysZM6Ss6TQMrFpDpUwYsxeKKByJoco6HiVEpmr3891zvhGUstdIWnYZZG+t e4oIwSFuDH3nZ92tKJnfY3lWLvJT3CiDiZJcqchosCfg4rOFVMwvGX1FoFOxBVtNtbuiBMMLUnHk UGnmXbKARhWIprLFEOeS49gvMfkbOHA9pUSOZSVHIYc5l98AqH8m6GBIVZMsJkxHAYX8gsCxCwXI 74JN2B6BC7jyJULfzN1apYToGBxJ1BdvolJC7XWNOYSjtlpFnP6JzParzDsOQNZlxGySkpAmjMQk qwZDF3NSM7r5iY5EkWZwq4kBATTyCFhteUwPxDRzoDYKgmE/FjiAR9B0OAlvrEuKmGU0epJfQSOh BwddhipzZyIuVvzc5cQaBCusTAY2ANB35eQW0sDB7G5cwRKCkzm3WUJyA09ZBvbcGnt+DHWeZ6UG f0g9i7EGQcQ8wrEqumtZFGAmEwdgmMwHWGW+XkBroKUVXdfWODIYREdfSfWUAKTCNbHgJnHxL+J1 HqDbEaNynWTr9hoKDqKdC8hKBq1WPZuzgBkEOYLEzHYjbUUClMXz/QeBkGoV8oNosA0HrmCw7Yp4 GhwjvFtHYs3u73ZLzEZm/W5QSGqOIkKQJnIkkwuYlDSm0qhQJeA4+YceQqBRO1jAKEEShvUqTYS+ 5hQYomwdhjIELyTW0KzGHX7tgQtRgaSwxCRvICwYFS4nWeNUTN9G8mDUKQCwEHEkHrDvglBubRKq BX1ggqoBehpIYNKBdpXIgkg5GCqgVMmYvQONBH5B+JWAuJ4yoFcqwll0E7ukQ5QzPU2UBHOEfq1M 8WDvnfOYDgGZxSFu5kFkB7T4CWwCmXHkvCJgYAxM0HaxqxPiYqen35CxBkOxeM3A3GxvekS2sFIZ eI0qIGMGgwN4hcqEQ7hiVkXdl2xZYgBaAeNTw1OBENgyUFMnXdhgsII2HWYhAKCy1vgxXZrAqS0B TSzKRnJiFcLBJODBaNxccCBiMOxPEhGCIIUCk4IJEQPl3ZKwGOaS0gyq4HY97ZOh5JQLdFdBW3Qu YgqCoBkvQbwsozXqGlcihWOg2+y4sNAA+8xQV4qgr+CSUrl7ok5gxrGm7OTeOoMNUoVF3ad+9UlB YDB3AVigXBXaMmUQIqRcqyCW07CgScY02n9QmA5smroo9An9rbBfkzSzWV7AgGYdRlaFzD2vKrCu QjAUatAu0PNNTTbqGDC+kgN8OdT1sNPZMsHn0LMUDsEcF/yCmaeXnIOACkX7OchveU7WovzDdFNG 6UMqj7LVqKRfSZ7BKtXBRMTcJHeQBEVIKPNz4hiBDadRvY2UutjHpeShyZSzHNX0mETUJSEQBPIZ oGzcN8o4MxMwFC9JoMwGryqDUtU2GeG7BGhwUyJAqXTr7kyHf+LuSKcKEhwg/1lg