From: marko.makela
Date: June 1 2010 1:43pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3491) Bug#48197
List-Archive: http://lists.mysql.com/commits/109764
X-Bug: 48197
Message-Id: <201006011344.o51D1fbZ017775@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1348351901=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEyMDc1MS0xdXE3
YmJ0YTVuN3RzMHFyCgogMzQ5MSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAxCiAgICAgIEJ1ZyM0
ODE5NzogQ29uY3VycmVudCByd19sb2NrX2ZyZWUgbWF5IGNhdXNlIGFzc2VydGlvbiBmYWlsdXJl
CiAgICAgIAogICAgICByd19sb2NrX3Q6IFJlbW92ZSBtYWdpY19uIHVubGVzcyBVTklWX0RFQlVH
IGlzIGRlZmluZWQuCiAgICAgIHJ3X2xvY2tfZnJlZSgpOiBJbnZhbGlkYXRlIG1hZ2ljX24gb25s
eSBhZnRlciByZW1vdmluZyBmcm9tIHJ3X2xvY2tfbGlzdC4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvc3luYzBydy5oCiAgICAgIHN0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2luY2x1ZGUvc3luYzBydy5oJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
aW5jbHVkZS9zeW5jMHJ3LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDEx
MjA3NTEtMXVxN2JidGE1bjd0czBxcgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVk
ZS9zeW5jMHJ3LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMzQzMzUt
Y2N0aHd3cnUyM2tuMDlxdwpAQCAtNTU1LDExICs1NTUsMTIgQEAgc3RydWN0IHJ3X2xvY2tfc3Ry
dWN0IHsKIAl1bnNpZ25lZAljbGluZToxNDsJLyohPCBMaW5lIHdoZXJlIGNyZWF0ZWQgKi8KIAl1
bnNpZ25lZAlsYXN0X3NfbGluZToxNDsJLyohPCBMaW5lIG51bWJlciB3aGVyZSBsYXN0IHRpbWUg
cy1sb2NrZWQgKi8KIAl1bnNpZ25lZAlsYXN0X3hfbGluZToxNDsJLyohPCBMaW5lIG51bWJlciB3
aGVyZSBsYXN0IHRpbWUgeC1sb2NrZWQgKi8KKyNpZmRlZiBVTklWX0RFQlVHCiAJdWxpbnQJbWFn
aWNfbjsJLyohPCBSV19MT0NLX01BR0lDX04gKi8KLX07Ci0KIC8qKiBWYWx1ZSBvZiByd19sb2Nr
X3N0cnVjdDo6bWFnaWNfbiAqLwogI2RlZmluZQlSV19MT0NLX01BR0lDX04JMjI2NDMKKyNlbmRp
ZiAvKiBVTklWX0RFQlVHICovCit9OwogCiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVHCiAvKiogVGhl
IHN0cnVjdHVyZSBmb3Igc3RvcmluZyBkZWJ1ZyBpbmZvIG9mIGFuIHJ3LWxvY2sgKi8KCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vc3luYy9zeW5jMHJ3LmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMDYwMTEyMDc1MS0xdXE3YmJ0YTVuN3RzMHFyCisrKyBiL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEwMDYwMTEzNDMzNS1jY3Rod3dydTIza24wOXF3CkBAIC0yNjcsNyArMjY3LDcgQEAgcndf
bG9ja19jcmVhdGVfZnVuYygKIAlsb2NrLT5sZXZlbCA9IGxldmVsOwogI2VuZGlmIC8qIFVOSVZf
U1lOQ19ERUJVRyAqLwogCi0JbG9jay0+bWFnaWNfbiA9IFJXX0xPQ0tfTUFHSUNfTjsKKwl1dF9k
KGxvY2stPm1hZ2ljX24gPSBSV19MT0NLX01BR0lDX04pOwogCiAJbG9jay0+Y2ZpbGVfbmFtZSA9
IGNmaWxlX25hbWU7CiAJbG9jay0+Y2xpbmUgPSAodW5zaWduZWQgaW50KSBjbGluZTsKQEAgLTI4
MiwxMCArMjgyLDggQEAgcndfbG9ja19jcmVhdGVfZnVuYygKIAogCW11dGV4X2VudGVyKCZyd19s
b2NrX2xpc3RfbXV0ZXgpOwogCi0JaWYgKFVUX0xJU1RfR0VUX0xFTihyd19sb2NrX2xpc3QpID4g
MCkgewotCQl1dF9hKFVUX0xJU1RfR0VUX0ZJUlNUKHJ3X2xvY2tfbGlzdCktPm1hZ2ljX24KLQkJ
ICAgICA9PSBSV19MT0NLX01BR0lDX04pOwotCX0KKwl1dF9hZChVVF9MSVNUX0dFVF9GSVJTVChy
d19sb2NrX2xpc3QpID09IE5VTEwKKwkgICAgICB8fCBVVF9MSVNUX0dFVF9GSVJTVChyd19sb2Nr
X2xpc3QpLT5tYWdpY19uID09IFJXX0xPQ0tfTUFHSUNfTik7CiAKIAlVVF9MSVNUX0FERF9GSVJT
VChsaXN0LCByd19sb2NrX2xpc3QsIGxvY2spOwogCkBAIC0zMDUsOCArMzAzLDYgQEAgcndfbG9j
a19mcmVlKAogCXV0X2FkKHJ3X2xvY2tfdmFsaWRhdGUobG9jaykpOwogCXV0X2EobG9jay0+bG9j
a193b3JkID09IFhfTE9DS19ERUNSKTsKIAotCWxvY2stPm1hZ2ljX24gPSAwOwotCiAjaWZuZGVm
IElOTk9EQl9SV19MT0NLU19VU0VfQVRPTUlDUwogCW11dGV4X2ZyZWUocndfbG9ja19nZXRfbXV0
ZXgobG9jaykpOwogI2VuZGlmIC8qIElOTk9EQl9SV19MT0NLU19VU0VfQVRPTUlDUyAqLwpAQCAt
MzE2LDE2ICszMTIsMTYgQEAgcndfbG9ja19mcmVlKAogCiAJb3NfZXZlbnRfZnJlZShsb2NrLT53
YWl0X2V4X2V2ZW50KTsKIAotCWlmIChVVF9MSVNUX0dFVF9QUkVWKGxpc3QsIGxvY2spKSB7Ci0J
CXV0X2EoVVRfTElTVF9HRVRfUFJFVihsaXN0LCBsb2NrKS0+bWFnaWNfbiA9PSBSV19MT0NLX01B
R0lDX04pOwotCX0KLQlpZiAoVVRfTElTVF9HRVRfTkVYVChsaXN0LCBsb2NrKSkgewotCQl1dF9h
KFVUX0xJU1RfR0VUX05FWFQobGlzdCwgbG9jayktPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJQ19O
KTsKLQl9CisJdXRfYWQoVVRfTElTVF9HRVRfUFJFVihsaXN0LCBsb2NrKSA9PSBOVUxMCisJICAg
ICAgfHwgVVRfTElTVF9HRVRfUFJFVihsaXN0LCBsb2NrKS0+bWFnaWNfbiA9PSBSV19MT0NLX01B
R0lDX04pOworCXV0X2FkKFVUX0xJU1RfR0VUX05FWFQobGlzdCwgbG9jaykgPT0gTlVMTAorCSAg
ICAgIHx8IFVUX0xJU1RfR0VUX05FWFQobGlzdCwgbG9jayktPm1hZ2ljX24gPT0gUldfTE9DS19N
QUdJQ19OKTsKIAogCVVUX0xJU1RfUkVNT1ZFKGxpc3QsIHJ3X2xvY2tfbGlzdCwgbG9jayk7CiAK
IAltdXRleF9leGl0KCZyd19sb2NrX2xpc3RfbXV0ZXgpOworCisJdXRfZChsb2NrLT5tYWdpY19u
ID0gMCk7CiB9CiAKICNpZmRlZiBVTklWX0RFQlVHCkBAIC0zNDQsNyArMzQwLDcgQEAgcndfbG9j
a192YWxpZGF0ZSgKIAl1bGludCB3YWl0ZXJzID0gcndfbG9ja19nZXRfd2FpdGVycyhsb2NrKTsK
IAlsaW50IGxvY2tfd29yZCA9IGxvY2stPmxvY2tfd29yZDsKIAotCXV0X2EobG9jay0+bWFnaWNf
biA9PSBSV19MT0NLX01BR0lDX04pOworCXV0X2FkKGxvY2stPm1hZ2ljX24gPT0gUldfTE9DS19N
QUdJQ19OKTsKIAl1dF9hKHdhaXRlcnMgPT0gMCB8fCB3YWl0ZXJzID09IDEpOwogCXV0X2EobG9j
a193b3JkID4gLVhfTE9DS19ERUNSIHx8KC1sb2NrX3dvcmQpICUgWF9MT0NLX0RFQ1IgPT0gMCk7
CiAKCg==

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# testament_sha1: 76626b6b0d6b9fa5c00b813e0474b8606682cd90
# timestamp: 2010-06-01 16:43:53 +0300
# base_revision_id: marko.makela@stripped\
#   1uq7bbta5n7ts0qr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdnCogMAArJflBAwWnf//3+v
38C/7//2BAAIAFAFbJt7QKXWSMELYhJJNEyZDFPTTQZDSnplAAAMjQeo9QNASUTTEyU9PSnqj1MJ
oaeSD0TTGoPQI0aejUGnqBiKU/KnlNNNG9UYRptTTQAyNAAAyAAOMmTQxGJowCMBMIAwE00aZGgG
EkghkmAmJqTwqaNqHqHqA9CeoaNpA0ZqCBQIOCo0VdELP6C2JG9nHy/B7OvXN75Zgtfm2TojYImA
DB1S000BlwppymutTYIFo0aXZpiQtBJApEX/LvBr+sKEJZ8omUoGdOouw0VB2DoxjO4dWP3NFkoD
aLaAHVb+fav5raCSA5P5crfAESuI/y4ZldzcD9OvZ0jEmjgba7EEDIp6TKKQkVS39nzGgTE9UaZv
J1hQ3ewvC8DgW0kd4GYCZlTPUBcBuys3PQ4wgX7ixgZ2OwAb9dwhPREa4q1YEXdxkgAyCQdBEibb
JIJHIDsjq6gCJgkUraNLWgO+FDJ5mZsVQ+4CiuFiStYor3Q4LEjNxeXUXVaHpFTmgRU2xZfh5Nqk
Cn2hWv6r2wqsO8VxPhR2+TWJKdxEuHAZRDXzWaeRVhXWz0iYazmbe4CWJzwlBNdF5tEYDKhEvkYZ
u8RaUTOL8WorrbQYIAOHVgNztAgBhWg0KismBLN1b3EXrBnPrHsgqKR25/fCJe3vG0V+oE6Z37QA
4yqrCY2AzHJXPezETeUsTA6GNcERoLKSQE4LON85KpI1KLSBgW9TxngWFzSiUsxBQB0sbIFH4AXv
vB81YAwo6y2QR/i2Cza/4lbGJc9+DQQWagW7sCLxtZOaDXSvaq2qghS0R2Mt28C6mgaoBz8pRtzM
7iZoQHLPDULgM/m7McSryDFcyjSlWGDIeILalW0GRZWpIg4i2wVotfKsx5wZlPn0A0pqIICJKu88
VwqBWAuSI8bMwzN9w3e5GlGx4LSo9IvyfMrLhH7TRdyHo1GkUFPUh6pFUmEXRck9OUEPP7LiArBw
vE95kMKQnB9SsVS9bMzNAqUkOPYvYJeKPFGKHh5hfmNszMrEVL7Czgdn4gFbRe89pmA5vhMzligO
NAJxr0GjrBZAtnxkze2YI5AOhgLq7NswepXJc0QU2GNtm63Afhw/F2QaGJR1KgCE+1OXh5xJjeqg
GFXXwsPUBIDqG7jYDfiBhgBqekC8j4VmE2Kf3SewnAnrIFnIB+UV0GdqZmvRxGI40stmHlkDnooG
npApT8uKwCO1SSXUXmzbVoTPEorvtjKiK6vBpVO4vK42nZ2MxI0nchOwxTWZDIXw30vbdXuaThTu
ab9OOKF45vowXJgzzaXa72zl9txIjAhz8e2UDQ41Go3ONIGDMSXK8cu04EhgtcXd0dHA/hAJXrIW
CicZQJREriveA0vHGjO6Ky5lUKd5T7ltRDk2YfRmqhw5o8puki9LpEdrvEwlgC92aOYGqFsEkScA
cSQJgnORkDOw43hFRFOSlKfzoXWKRzBaL1ngmHbZKjEhuNK9xGKjeKLDajcQO1OUz2oJKpQZE2cx
y1Se/fFJzB97l03IXBCoxOCFQLu6TwnMFtRKu+5ZLFhI7GGCBPipey4rygV5QwIDkT+8uGW0ilPI
5S3q0Kavk7FbAfygQFQUp5RrXrr3yKge6dz25MWlKGKTsYqMIpOoA7EdbDR5ViZpv3Cgf6HBURfp
ZiHToBRlteNNG4Hi7VB4ZOA3zXntgKyfcqLbfEXAsvZNwRI5o3CYYTcgM4FaLZvUEDdlcI/wWtef
/Euj/i7kinChIbOFRAY=


--===============1348351901==--