From: Martin Zaun
Date: November 6 2010 12:43am
Subject: bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3958 to 3959)
List-Archive: http://lists.mysql.com/commits/123010
Message-Id: <201011060044.oA60WPWf022861@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0145169091=="

--===============0145169091==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

IDM5NTkgTWFydGluIFphdW4JMjAxMC0xMS0wNSBbbWVyZ2VdCiAgICAgIG5kYiAtIG1lcmdlIGZy
b20gNy4wIHRvIDcuMQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL25kYi9zcmMvY29tbW9u
L3BvcnRsaWIvTmRiTnVtYS5jcHAKIDM5NTggTWFnbnVzIEJsw6V1ZGQJMjAxMC0xMS0wNQogICAg
ICBuZGIgLSBpbmNsdWRlIHJlbGV2YW50IHV0aWwgZmlsZXMKCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9uZGIvY29uZmlnL3R5cGVfSkFWQS5jbWFrZQo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9uZGIvc3JjL2NvbW1vbi9wb3J0bGliL05kYk51bWEuY3BwJwotLS0gYS9zdG9yYWdlL25k
Yi9zcmMvY29tbW9uL3BvcnRsaWIvTmRiTnVtYS5jcHAJMjAxMC0xMS0wMSAxMTo0NToyNiArMDAw
MAorKysgYi9zdG9yYWdlL25kYi9zcmMvY29tbW9uL3BvcnRsaWIvTmRiTnVtYS5jcHAJMjAxMC0x
MS0wNiAwMDoyNDoxNiArMDAwMApAQCAtMTgsMTEgKzE4LDExIEBACiAjaW5jbHVkZSA8TmRiTnVt
YS5oPgogI2luY2x1ZGUgPG5kYl9nbG9iYWwuaD4KIAorc3RhdGljIGludCBOREJfVFJBQ0VfTlVN
QSA9IDA7CisKICNpZiBkZWZpbmVkIEhBVkVfRExGQ05fSCAmJiBkZWZpbmVkIEhBVkVfRExPUEVO
CiAjaW5jbHVkZSA8ZGxmY24uaD4KIAotc3RhdGljIGludCBOREJfVFJBQ0VfTlVNQSA9IDA7Ci0K
IC8qKgogICogTG9hZCBsaWJudW1hIHVzaW5nIGRsb3Blbiwgbm90IGhhdmUgdG8gcHV0IGxpbmsg
ZGVwZW5kZW5jeSBvbiBpdC4uLgogICogLSBoYW5kbGUgZmFjdCB0aGF0IHRoZXJlIGFyZSAyIHZl
cnNpb25zIG9mIGxpYm51bWEuLi4KCg==

--===============0145169091==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.zaun@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.1/
# testament_sha1: a27a14ba9cbb4b38b3abd3547db3616dd1a2a65e
# timestamp: 2010-11-05 17:43:07 -0700
# source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/
# base_revision_id: magnus.blaudd@stripped\
#   7722tt8amwhknzlm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYvGWZsAAnzfgAAQUOP//34D
FhC////wUATgvXQpne93GtTZ52wkkjQEaKfmpkMjU0epkygyaYCZAkpMjAmSZT1PTUnlNPUMgAAB
oCShMRT1P0aU9J5DKNAAAAABGqNNIaaZG1MhoZNGm1G0TQGQaYJIhCaZNBlNHomjTQZA0AAEKriJ
v5VqPQhqsnkBtEdAQa17hWvcW0TyxksVFzu4s50MMweWHgvZ5NI0K5HhWZ/O2YmkdXPFNnOGdx8u
8DHz+iLxLH6vje4HMU1dd9nvoeao9oOpcKzsLmMfkpLwRuN5guBipkECs9iXENxhPM1rD9ovikW9
JeqckoNTG52zS8TMud46pA9gZ4CjAVmWlBENuRFrUPyQ0T2IVXtOy5DkUs5520/ZG+g2Jj1nTBA1
Sw1s4oZKzCJFNblEEgtDPeSQiiUSRMpQH8eqGhor8iZ79UMeyfMqaJ1kFypQ16YSCdid8S66Dy8l
PTWmjjASG1K1SrQUJ5RDRTc2I4aO/Wc7xXu7d5bWVbEVLHNtrKY0m7hhMvUEdfA/yBuODKCg+69+
HWSDna5kiMERoK4IoOOsYNwZiXZF12/TR6cFEaLuIlnEgbUhciCeWL23Cg0ZhVYim3ZbGPZuZIKc
7DaV3UaT3agze/NA6iFocTOYbsIq3FxoHPHyMCYbcrRjCOqbTLNjG2PWrG6mD1HJtS/vLI4DzRkD
zII8SL22r1ILzmE3aA4xI2KJ+ssSAxTK4LWxiQ0i0aVlg6vJHBgZBGeuAHuMIXwJqi4qI0DEDKNI
rsE6HIKh1MMhigaSiKegYjuWNT3FhosDjO/Sc8klIXoexRUwzJmbyPPoeg/0PY6Fnf8FmXuRFBIZ
jI5QKtbJOt8Iyb0hlggac2oR9yLeUZsFKlJVzADeQ7WYjgZSFSEEkHKl4BZ22Ac5Wkv6tqK4C+y9
Jfqz1hd3GGs799BfEzXmBPv3jxmm8hTm48VvAsqLDWTYo6mQVmSlB9psf9LT1mBVBizKJJQEis59
3bGpVsujMxxzGNQSIYmyB4XiqtJAdzctQtNeFC9aSVOqP8wBdXNW/Xzfskvkj7ON3UzcRnVSpSxd
OrK3ThE7Ld1Ts/bSrGUeW0jnpJaWkbPocEF7iYiRPHAx49l5sKAqSgDSzAyeG52iFposuKKDBVKY
+sqzayyGsTivOggwsDOrRTT9ixclYXElkK+WD4zabQYiZ1HLQohmYZkl8CzRfVpWRliWXBLEp4vs
4p4TuQbFAXKlfg1gUJUjgT8wm0DJJi7VlNx0LAcW2xCL4rYQJ1aL5PMZwYd9BrRi1RMgXm4MKeYk
oaQgv6esZSHE1JNOjIbQkmKtkSAqg3pzeoEOQtqdmgYxGZ2iiFcuG51uLYiFIlr8cR72WxJTpUIx
HC7bIlQZt519EELxmRuCVTrk7+781axnOShpvN4OVI5og8capI5j3vYBI7zNRCRaSNuLeBb2vVEB
ABnPQV0sjF5YKmMUmPWrBm3TbNYSDSYp8hXW5Z7ubEGNSIbS1MRLTqLU85S3CVAwgjgSpSgyO5XE
8woHfIREwmSTOFm2dpfGK5LeuGnFaPyFNPlU0Eg0E+HcgyD4pJxZPP+LuSKcKEhF4yzNgA==


--===============0145169091==--