# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101022024726-117hurgyvqtw9dut # target_branch: file:///Users/mz/mysql/ndb-6.3/ # testament_sha1: 345b24ac812f13ddafa19cca939842c31035d541 # timestamp: 2010-10-21 19:47:36 -0700 # source_branch: file:///Users/mz/mysql/ndb-6.3-int64constants/ # base_revision_id: martin.zaun@oracle.com-20101022004432-\ # g4k3vx4c5kvo9nix # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWapjyr0AAn7fgFAwVOf//1YD nRq////6UAT6vAAMiQAANECJnqKeKep6jNT1HqHkjRoNDanqM1PUGgOaYmTJowmCYmmATAIYIwIw DUJ6jUekB6m1DT0gAAAABoADmmJkyaMJgmJpgEwCGCMCMAkkIBoTNEBMCaaU8jUaNNNNMgGnpCBA goQwRB0/JnYICGVEJrEam1jj5jAkoELSiIKcWCWJhq32Ypw+MRgz23lQtjgDjMjbOpjxCCDXDjs3 Bkh0PPRtQ4Ac4dU8o8d9Yk85CVmJk98jA5xvPavfdCUi3MXxgd0DI0gjuOiD6I4d4rjM3HduLj+C aobgXXna6TxQ4IR2vQLU1UHOdwj0nEy9HZAA8SGyHAhyExncA7rCFbCKu8NDUI/ecdUMVjWKTCgb hkI9zJA9X5Btp3DXe/H3BOUFeBEdlvMSU7IsX9FRTPBxdIla40wCUThormC6ZXas3GqBY4WRmJ5q HghnoUrJAhiPlV0mQaGFWasgm13F8SmjJ4pcC2KDlutlrtmcPIE0wow4P05l5bfPRtNWUTOum8pn vQf90QbBZ0o1ElqzIFsZha54FAp5xHdji7OAVPmnB4Jy0mgVj/6F9S0u2W2xbB1c6C3OE4yjySuW wgUjZO/wfTx07Ii7hyDXOFBwRXfvdJY7YjyRiFNmprrafXqW7NmgqIBotsOUOdETQcaUbYkqNeIV Fzmmi89UF/qgwXfZVKN5XgOrhVxTp769EBExQbIKixxuIhZVhgFcTHsKicoVREsHp5UNMJYVj1W6 cZDFI06qFTUMePvV59vh7DlHprHsN7P2ar2EziBBwhMGZGMO/H5btVaMHff1+r3QSFLZLpmFEpFn w7WDn0LBV2C1HDOFd1fXC21/VcQILlOBEbIDBa/SeIMDPJAH1PESPnrcj1NKEb+7EDdZllnpmnNs 47xoPdece+Jp8S74/A/Iy9EU4UXYQoF3nOR8iZ7zvt5nR87hkI/QSMS5WaOp8VSVhPMhxVAOz7dk ngbRoFcN+68s6qOIXZQEG97HUDBEFJKMr6Qm6RjUDm11WJkcZ9SjUt4Fojvpimir44aXqqb+JooR QfdSsVRid94coMZslwWAhaRMivdWbpcT04ECYYpTkyW/zeEDTrG59iTiUMVNzDjcvr4XeVO54bxm PIWWhBzcHQ+xJ20VOPmGPdgGg2KJgaDEGO105wVhLUoBmMfcMJHzFAv/DYZjzSlHolxJChyebzxO QjI4ibWKnwF1XM3gQSiOAs7NrrQhzm892R7SixVjkI9iBjUl8j0GcDDnbTvRY9WhrPoVExMufU3/ 9H1gsYsMiscnCQ5Z8R0EIYriTpOIs1JhZuJ6RpjzFoNqCDIYXe88GUhZuDwrfvAVIejLyKplXqQh 4hyObhVbTmsNOkZkQUx7lTsmPRBV7RkctId1bXSY1hImBLgmU4GPg1x1MlVgDT0oszfI7E5EBURp HCZ8Or5DyFxQw1eCTaaV5MNz6N24IiJ9gnCeOoQSLW6l48d5EIDh0xhgxpTFJLYWAwCm0WCIi4Jn KZyPBBpJBrQTmew63laZCJvaE66soX2i1geAtgeaDkwuaDaDWoM8XiyVAxW20cGIoFG+TkcjzB8u SETWFNZ9vn/4u5IpwoSFUx5V6A==