# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101128110435-dxrvvsuf7kf1t7v6 # target_branch: file:///Users/mz/mysql/ndb-6.3/ # testament_sha1: 6831ad6509a1b6a1b0610522562eba912b8adba8 # timestamp: 2010-11-28 12:04:46 +0100 # source_branch: file:///Users/mz/mysql/ndb-6.3-int64constants/ # base_revision_id: jonas@mysql.com-20101128095839-tf9m1vkbxl6yugwv # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYX40u8AAktfgAAQUGP/91IC ABC////wUATyz3brcm1dSoN6dbuEkhU9MBTZRp+lT8KemKbSE9TRo0wlIEYmTJqIGmQGTR6Q9QaB JECnqp7JlT9U/0mmp6pp7RTTIAADapTyaj1HqA9Q0GQGgAABJKaGiYnqMp5qGTVPZRqeIRpkaY9C ZrKehXWqlUZli7BNalqEatZFgs1Eod9fCahSjPimjS8djGzpquGKayAZ8uJy5iz2Kus/Ru5SXqOc qaUPMceiwe5LMjxdMWAjAMiIbL5G8jJfA38LzxuLAvE58whfxPEVEk67tgwgs10nfppJJrx+o944 IdIL29JwMDYkFxZ0GUpHZqaMVVoo4IoK9mFRMQQPMyUEQmCpBgFWo4JwQ4lJkQM7x06PsTmaIQNa K7iZDV6v3yrCiy9qyVYyZZZxzDdVgUfyEiWcom42F6ivZ2NIpB8I2gLYuy1nVJxIkVC9g8ikwQYE yr5cbz5sorM7Tc4WjWlJ1ZFSBK0R2XkS2mE9TbafDJY7qezNyMygYoLkmOwZwT+s1REMnsvyN5QO aUL0Cb0ZZAWI/hEn438H20VmxtQ3kqvjc5YIIwyspLzyB0vomNuE064KtOad2YymPOdG1sY3Ot4Y oGCk6Bcg1nKLIb94Axu19rjpubZGmJF2x2RhUcXNLbYR66VXDFJoE+Dhdxc+DbwYbFkmJYTKznzY WJKH4UMI3L8Yp1I92A5QqPiNAsNIzTIJuQTzhMZDEBpKgqTGPCtOBClq4h1PfsOXdTJLN5UzMDHx JkWFjxogQ0r5yUHFnOBp7d85E+/ySXQjw4FbiaVg744ETWsD+DxBOmWiYu+S5JfnrIYo6FtrR1br OalrmNXHesjHfRaCphtJP5111WWGS+rbx87DJKtREio/si6e2pwhC0veXX9jcX2h6SUImrmLh4eE 5KmE7/mU9FMdtuwuEM6uv17J4B5l/6wfbCD9peY2N8u/SDxiodVwS3ifn3y692nj6Z3kYuPiG1LO yVRdN4GtbjB39HhlgyzEyLMuRl18zQcSjD0pAkOK26BZJnXd4CJpI1C1dJzOb1dT7Wqg/3rvJmSo JjigzkVAwxjdyQNs2lC6H2NkKmdYoIULmb1wU562d01pSewMQoOaY9VrFOCLDYBIIOgpd3tiYDiK WxKI8ddsR1zkFSHkclyqDmEReFWrz6FkA5KB4TjwMKdVVpJjuuOBoZvKhhIwTH6lV6+hw0gMSSYm iPJVyraGKDIqOJIXPHr7FRvGVBO5wkOKUj4TxSTHZlUmKsWZm2hIbIuOKqwoshhcfx1bVTy2EuVY YmqZJEAoOCcX1jAiFd9sVLkSwb04c3XuWnQZkRVDRUuTyIugbGot/DUJCRmNdECpuQU5NZ0evIhg QkVBE5cQcXovApNNyNalaxZqL0mxUp1ZNpq2gpxTinu5hnCPcWdC3THVB9gmbUpsMRTliPO41L1Q 25HmYg4IvQZFeQRCEz2izK0JPysSuiU5SrKcwCDxsRJ1SqNwaWwFZilFdPcfWHM2INwZHb1RGA1K zvCAUinfBPXJbi7LqXdEliVDykwppPsXckU4UJCF+NLv