# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110228115118-ogs3ib1eaz9bsgkt # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: a558a70deb6d9fe78d4bdb9cddad7533b67afe6a # timestamp: 2011-02-28 13:51:46 +0200 # base_revision_id: vasil.dimov@oracle.com-20110225095018-\ # jgmv1pnuprrjzat1 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdrHd1oABmvflGAwe////3// 37q////+BAAIAGANPOtrbW77ve7eudROwULC7cdncWYJdmQtdOMmJUO4SRJMKaZkanpJjU08k2U9 G1NT1Bo009Q8oAANPSNGgSiCVP9DSbTQqbJHqaNqD1HpDTagAaAA09QBpoCJ6QZIU8kNqGgaNBkA AaANAAAA0ASIiAgmKm8mmqn+qn+pqfqeSKfoam1DTEYUaMmgDBBoOaYjIyaZNAMhoyGTIAAAZGmR oGEMgSRAQExATTTImVPynqT2qeUNppBp6gaaPSAAGiCjG20goIGxtMY2m0mmB9zBQ002jX3RLN7h oTBtgxpsE2AzVXpI+u3qwiD8m6WKiOkYrvpqk/KD4nj+0J1A7IGC8k6JJg+YgxD4TGVxk0Ze+h/1 vRBH9/xo2dl7eXz3GkzEYRmmjZLqimo+KvfSm1TQxbirsCrukI73Jn2oVBrZJYW2W2dh0g/DilBF ApUdMptyIzxR8Q0KIGpl4qdj1u3LTCKyWePynNM9+Fuvj6FgqeVoMZNjCacrOYo86MncDCDDMMyT MkNto28/wQvDxfHj4suHg43SR68La1soK6aM5OMYurDFBRBFEzgJQ0PADRIUDcERHyJAoK6D1VHK 1qs7StM0V4622wv9Dpbtw49zyVIjYYbIPoGgGF4+KT9O2QzVdUjVJtySw2hslBPjXtTUz1FOV8Gu FaJ3p2UKm2NNObNouoThHathf4M61Fh2zCvZ31kxoit3RMkzZRsn9QxCXBJt7FztoWx8LMtZmykK a3wHLDakQc+BsSbipVs9haeiI2bB2Znuhgz452z1PYiODWWUN9siA0qCnO63uyk2BMJTnI1ixwnR 8uIKWm6k1V/CIrQVeY6xCrjAcpvsFeUy9u7nMDAz0XNqWFc6JunO2bAkFhkKzR41vNazDFlM4yFs PGrjze9Rld8ZPbaYlOEPribblJYn3sf1GR5VclvanjzXpTtlJ3jAeYy88JRBve+3yejx6Ec7UqgC GrpjnnUNijEWCu1dtdmWXH2hLm69QkZN4yCJ3xEqkixUHiJsx3ZWvDdURLm7+q3cfksjW57R7VaK qztVzXv5iHd2d2eCSJA80S3kgxgYQ4G79tHDEj+mq86unMizS0gbNThpBtb+mprNpb3uAF4hK1Xh 9sWVhIMpB8GQbv0mrWAkxssK8IwG72SoOEySgyGWq+pclMhYYjmJGuIldUNAuSzW8ZQZmibS+Ym+ mifW5OlgjT9By4GjhrvSRZhoEtZkZCWFt1gl2SmsfEZ5HwzfVNp4Q4X/bbSl2L+CWAnn78nhMStG PiJNa1S/QmbCu/sNYWCV7NyugZIYSzXYNu73Y3CWEDjHeHSzAM2G51g75vjnSnR+v1sSK1wTT0kw m7movmZBsSvgsGSdM+LhWWZTVEkBBtGLE6y+asqTZwz26bhK5ZhJluZQLMioqqoq/ABIlJnvtNBT hYMkZJrJzGhFcG2YxnGEdkqXDYxdPbEttGUNjFsTImJVlNrHEqlvORyKl5E+USqTNV2L2kr2L44i 3tVilbCMQdydb9FkUm8BZlajWNTYQN2pufKZcKYbhJhy80rW43FDAzuZ6tHVCLfbZnaSBiy8cPNh 4CVc8C+WFC2nXwJG6edLjvDcYk8LZA0LWbAeo0DAS+wsGlKDwuHUk8axEqHFtSjsaxq0PGMpujIe PtImsbo3UJVwe/XqSiWaGAleVLR8Y5NGdJ6rKkIE6eppCVTBBtGHssLhKOtW3lS01aknNBg5/fbS zaW5vriw1dGUBJhBpNzrEmrQSppiRz1lw50IVndhvpdO26t+vYdeZw6sSzee0v0JG4Sw2mUJuJL7 II2t2DggSKJkcRt43Ejff2hEhLlFg0Zr7vUw/TvP3h27tWGRLY+qDfO7Q7OpGuRVhJ3OorwLbneC oGzKja9UruJ8eMeR+oud3I+nzCj3OWEKG2QqZLUD0jTGh9KJKpeHtRHZzaDqOkF1h5gaS/Et0nE6 wlf40eAbTBsfsFSGCPgMuT9PkjsD8jxifY2n78Qq5NgrE4y4uiGCIPRDiIIGBxrmIonEktIkyRAE XmHNZYQdIMMUFMBKYqTOJagyBYWGfW8xgQgYSr2gvCqax9YrlKVxYbF1SrqCgOJQ9VwnqJbRLcZB VIVQkYmgby0RaqEhjluI5yBgHg160BJz6yCT4A72jQLQ9PW5iL/ZsORHYEkHcR7RgGUBLaFSkDxI PORcCQ9AyiJEiRCguN5NWc9xO1DSi8LQdB5RXQV1qq9+FhggqyGxjcxCD9/d8/wUVMF9iGKK3478 KotYrEUVhZZoS3QEgvavV7DIekS9w5pPPzFKQapC6KfQ1HEU1IZJFNhrDHKVaS2ZpJJkImySsAY/ fadBI/U5LmjK3aop7/wOcg+yc7pH5uHxwI5IX/KJBrI97FwUMATeQNSCOQP0wYbWKrkekFQzi3ja Je76noJeoeHES8CB5HAoYF3cbqmlD2CUxEi0zs4xR9tXBROKNYPq9oTHARx88hGRyMUqfcoMol86 qz6/f2XUFtSsILLIIY4m5luCmT8qEEsY4f3KAAYG4S7vL6DkQb/RpoOolBzuiJTsqXHU2Acei7hK w6CXFcmE3rfWq0DuPJT73Kv24wI1tYJMgdJEUZpI7XoLJu2ZppPY0YHkxAZtbodosYMj2G85W8Os 9RSZ3ac7uJeYpYJOXw5lxRIYKm/6xL9HKCTJsuFFj1Q+PZvgaNkcQDmP7RcwpBaFEc0MbM37Pd+H 23+zumengFGgiIYuwOb5c4xZXHZKx9Fqi9O8TqMdkRc/fdvzVt34Z1kMXbdNOiAb72KzbnBLyG45 XvrDLzJfGPCauGgdxq8xlXNGiNddgmmJcdaHEcsA3nFls+EShzbYJJmUsNJl4CetVnnsQg57bpc9 2R1FDIkHlE6RuGI7oTq9BaxlT4omy/DU+rzwdKQYBdEdFHnHJ42LmbE1nGpSnK9MGN0SwfPRL3xB Q14dO4uWd83iPduguagROeaHMofVdiMrPCq62A0IsA2ZEgkW24Ab83ZdwrBJkHQ+QdIwMxipMc3F DvIkyiEdxwL7zrErCpJlyZBMdrZBIrycv4I7UcEU8B52PXSVSDuyRQjISUeGNwKCIqk2kDTQh2kV hZOoS/QO4vEnPm1KGPdEjJG02hP7VgsBNliI8UeVpLouXcpvTq+t6wF8sGv4/CJYaIbqdWaQ05AW US6aebi9UqA/JJa4hH/swqBy+dbwEXVYdWqhetI1Rvv3Exnoz5GhEBbDnJZomSFC+K+noBP0U0be xutbjJuVOPEUhQ4B5+vYbA8AxBMuYyTIR+98B8xTICIzEJYLfG47M4YwuAQcIpkgjdYuGXSSLkkM IooimGMaHa3rpQSbYHurPG5fNtrPISLRqixy9aQOfcD3nvEyH+TgpVu2jRZBR8MkcwonAZ7bRWI9 Vme58yOyW94ZMMgMyYhMNPkySWikxejYSUVVyOglEiKWqLYahVGlMVRxpIKn8ZrtLW1+yy28Vlqg mkJEtJrpc6tfXZzBIrJ6THlncCkyKCQcNFNEN9hKG4BCWcL/wW4JXVtpbqBcrKoEy5LckUWOUVpI qqd1rSRIGeYYVhPSj+Vc/WY7U/l1hmebDPe2ykIjqDG1Db4wjY0oJ2wm0o5NDSvFmNGL9oXWlzGU Xkd/SxEQtnIMfy6zK3oXO7slvTJtjg6GUYQdXsklw1qkz2uSGZ86TKFhAIuUQtQGVZilO4DLLViF wIxV9K9qUGJvM+8zhdVm5hYheMqhxayjLoHuiXR0eegt4kyQv1ml+z4rC68+xkD+P0Bv2YBVm3qp uEqoLqioiVY0ZnHQgoLJcWDKm/MObIN7WMxo/aFLo4gQbSu81ZcG7pXthZMVdDGJWeLxb4WYMcCq LQtwsm+WMtR6S5iIaiiaKVLWQXtSnSE7L24DBE24CLxGODpHysgx0jCsc7czWPQyYwsDmxYdNAPm sXJd7CdBeCrjBK87I3yDu5327V1XQQC+B/Y04rfNLthFYAmhdIL+dVsrXioCNTB4xDJbgerFy4yQ Tlxu3LJutblK6cyidFjA22AxVRE1+C+7bwZbcQVhpImXhJE8CXe4duCSmClKLnJpydwOpX+iDo/x e93/F3JFOFCQ2sd3Wg==