From: marko.makela
Date: October 21 2010 8:03am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3270)
List-Archive: http://lists.mysql.com/commits/121469
Message-Id: <201010210803.o9L7hFdU030743@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0599463681=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA3NTAwNi1lbHo0
M3VoOXFwMDE1d2xlCgogMzI3MCBNYXJrbyBNw6RrZWzDpAkyMDEwLTEwLTIxCiAgICAgIFJlbW92
ZSB1bnVzZWQgY29uc3RhbnQgQlVGX0ZMVVNIX1NJTkdMRV9QQUdFLgogICAgICBUaGlzIGFsc28g
cmVtb3ZlcyB0d28gcHJpbnRvdXRzICIgc2luZ2xlIHBhZ2UgMCIuCgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwogICAgICBzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvYnVmMGJ1Zi5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMHR5
cGVzLmgKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYycK
LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAxMDIxMDc1MDA2LWVsejQzdWg5cXAwMTV3bGUKKysrIGIvc3RvcmFnZS9p
bm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAx
MDIxMDgwMzE4LTViYW9nNXo3YTFvMHE5MGoKQEAgLTQ1ODMsNyArNDU4Myw2IEBAIGJ1Zl9wb29s
X3ZhbGlkYXRlX2luc3RhbmNlKAogCWJ1Zl9wYWdlX3QqCWI7CiAJYnVmX2NodW5rX3QqCWNodW5r
OwogCXVsaW50CQlpOwotCXVsaW50CQluX3NpbmdsZV9mbHVzaAk9IDA7CiAJdWxpbnQJCW5fbHJ1
X2ZsdXNoCT0gMDsKIAl1bGludAkJbl9saXN0X2ZsdXNoCT0gMDsKIAl1bGludAkJbl9scnUJCT0g
MDsKQEAgLTQ2NTUsOSArNDY1NCw2IEBAIGJ1Zl9wb29sX3ZhbGlkYXRlX2luc3RhbmNlKAogCQkJ
CQljYXNlIEJVRl9GTFVTSF9MSVNUOgogCQkJCQkJbl9saXN0X2ZsdXNoKys7CiAJCQkJCQlicmVh
azsKLQkJCQkJY2FzZSBCVUZfRkxVU0hfU0lOR0xFX1BBR0U6Ci0JCQkJCQluX3NpbmdsZV9mbHVz
aCsrOwotCQkJCQkJYnJlYWs7CiAJCQkJCWRlZmF1bHQ6CiAJCQkJCQl1dF9lcnJvcjsKIAkJCQkJ
fQpAQCAtNDc0Nyw5ICs0NzQzLDYgQEAgYnVmX3Bvb2xfdmFsaWRhdGVfaW5zdGFuY2UoCiAJCQkJ
Y2FzZSBCVUZfRkxVU0hfTElTVDoKIAkJCQkJbl9saXN0X2ZsdXNoKys7CiAJCQkJCWJyZWFrOwot
CQkJCWNhc2UgQlVGX0ZMVVNIX1NJTkdMRV9QQUdFOgotCQkJCQluX3NpbmdsZV9mbHVzaCsrOwot
CQkJCQlicmVhazsKIAkJCQlkZWZhdWx0OgogCQkJCQl1dF9lcnJvcjsKIAkJCQl9CkBAIC00Nzk1
LDcgKzQ3ODgsNiBAQCBidWZfcG9vbF92YWxpZGF0ZV9pbnN0YW5jZSgKIAkJdXRfZXJyb3I7CiAJ
fQogCi0JdXRfYShidWZfcG9vbC0+bl9mbHVzaFtCVUZfRkxVU0hfU0lOR0xFX1BBR0VdID09IG5f
c2luZ2xlX2ZsdXNoKTsKIAl1dF9hKGJ1Zl9wb29sLT5uX2ZsdXNoW0JVRl9GTFVTSF9MSVNUXSA9
PSBuX2xpc3RfZmx1c2gpOwogCXV0X2EoYnVmX3Bvb2wtPm5fZmx1c2hbQlVGX0ZMVVNIX0xSVV0g
PT0gbl9scnVfZmx1c2gpOwogCkBAIC00ODY1LDcgKzQ4NTcsNyBAQCBidWZfcHJpbnRfaW5zdGFu
Y2UoCiAJCSJtb2RpZmllZCBkYXRhYmFzZSBwYWdlcyAlbHVcbiIKIAkJIm4gcGVuZGluZyBkZWNv
bXByZXNzaW9ucyAlbHVcbiIKIAkJIm4gcGVuZGluZyByZWFkcyAlbHVcbiIKLQkJIm4gcGVuZGlu
ZyBmbHVzaCBMUlUgJWx1IGxpc3QgJWx1IHNpbmdsZSBwYWdlICVsdVxuIgorCQkibiBwZW5kaW5n
IGZsdXNoIExSVSAlbHUgbGlzdCAlbHVcbiIKIAkJInBhZ2VzIG1hZGUgeW91bmcgJWx1LCBub3Qg
eW91bmcgJWx1XG4iCiAJCSJwYWdlcyByZWFkICVsdSwgY3JlYXRlZCAlbHUsIHdyaXR0ZW4gJWx1
XG4iLAogCQkodWxvbmcpIHNpemUsCkBAIC00ODc2LDcgKzQ4NjgsNiBAQCBidWZfcHJpbnRfaW5z
dGFuY2UoCiAJCSh1bG9uZykgYnVmX3Bvb2wtPm5fcGVuZF9yZWFkcywKIAkJKHVsb25nKSBidWZf
cG9vbC0+bl9mbHVzaFtCVUZfRkxVU0hfTFJVXSwKIAkJKHVsb25nKSBidWZfcG9vbC0+bl9mbHVz
aFtCVUZfRkxVU0hfTElTVF0sCi0JCSh1bG9uZykgYnVmX3Bvb2wtPm5fZmx1c2hbQlVGX0ZMVVNI
X1NJTkdMRV9QQUdFXSwKIAkJKHVsb25nKSBidWZfcG9vbC0+c3RhdC5uX3BhZ2VzX21hZGVfeW91
bmcsCiAJCSh1bG9uZykgYnVmX3Bvb2wtPnN0YXQubl9wYWdlc19ub3RfbWFkZV95b3VuZywKIAkJ
KHVsb25nKSBidWZfcG9vbC0+c3RhdC5uX3BhZ2VzX3JlYWQsCkBAIC01MTAyLDggKzUwOTMsNyBA
QCBidWZfZ2V0X25fcGVuZGluZ19pb3Modm9pZCkKIAkJcGVuZF9pb3MgKz0KIAkJCWJ1Zl9wb29s
LT5uX3BlbmRfcmVhZHMKIAkJCSsgYnVmX3Bvb2wtPm5fZmx1c2hbQlVGX0ZMVVNIX0xSVV0KLQkJ
CSsgYnVmX3Bvb2wtPm5fZmx1c2hbQlVGX0ZMVVNIX0xJU1RdCi0JCQkrIGJ1Zl9wb29sLT5uX2Zs
dXNoW0JVRl9GTFVTSF9TSU5HTEVfUEFHRV07CisJCQkrIGJ1Zl9wb29sLT5uX2ZsdXNoW0JVRl9G
TFVTSF9MSVNUXTsKIAl9CiAKIAlyZXR1cm4ocGVuZF9pb3MpOwpAQCAtNTE1Nyw3ICs1MTQ3LDcg
QEAgYnVmX3ByaW50X2lvX2luc3RhbmNlKAogCQkiT2xkIGRhdGFiYXNlIHBhZ2VzICVsdVxuIgog
CQkiTW9kaWZpZWQgZGIgcGFnZXMgICVsdVxuIgogCQkiUGVuZGluZyByZWFkcyAlbHVcbiIKLQkJ
IlBlbmRpbmcgd3JpdGVzOiBMUlUgJWx1LCBmbHVzaCBsaXN0ICVsdSwgc2luZ2xlIHBhZ2UgJWx1
XG4iLAorCQkiUGVuZGluZyB3cml0ZXM6IExSVSAlbHUsIGZsdXNoIGxpc3QgJWx1XG4iLAogCQko
dWxvbmcpIGJ1Zl9wb29sLT5jdXJyX3NpemUsCiAJCSh1bG9uZykgVVRfTElTVF9HRVRfTEVOKGJ1
Zl9wb29sLT5mcmVlKSwKIAkJKHVsb25nKSBVVF9MSVNUX0dFVF9MRU4oYnVmX3Bvb2wtPkxSVSks
CkBAIC01MTY3LDggKzUxNTcsNyBAQCBidWZfcHJpbnRfaW9faW5zdGFuY2UoCiAJCSh1bG9uZykg
YnVmX3Bvb2wtPm5fZmx1c2hbQlVGX0ZMVVNIX0xSVV0KIAkJKyBidWZfcG9vbC0+aW5pdF9mbHVz
aFtCVUZfRkxVU0hfTFJVXSwKIAkJKHVsb25nKSBidWZfcG9vbC0+bl9mbHVzaFtCVUZfRkxVU0hf
TElTVF0KLQkJKyBidWZfcG9vbC0+aW5pdF9mbHVzaFtCVUZfRkxVU0hfTElTVF0sCi0JCSh1bG9u
ZykgYnVmX3Bvb2wtPm5fZmx1c2hbQlVGX0ZMVVNIX1NJTkdMRV9QQUdFXSk7CisJCSsgYnVmX3Bv
b2wtPmluaXRfZmx1c2hbQlVGX0ZMVVNIX0xJU1RdKTsKIAogCWJ1Zl9mbHVzaF9saXN0X211dGV4
X2V4aXQoYnVmX3Bvb2wpOwogCkBAIC01MzQzLDggKzUzMzIsNyBAQCBidWZfcG9vbF9jaGVja19u
b19wZW5kaW5nX2lvKHZvaWQpCiAKIAkJcGVuZGluZ19pbyArPSBidWZfcG9vbC0+bl9wZW5kX3Jl
YWRzCiAJCQkgICAgICArIGJ1Zl9wb29sLT5uX2ZsdXNoW0JVRl9GTFVTSF9MUlVdCi0JCQkgICAg
ICArIGJ1Zl9wb29sLT5uX2ZsdXNoW0JVRl9GTFVTSF9MSVNUXQotCQkJICAgICAgKyBidWZfcG9v
bC0+bl9mbHVzaFtCVUZfRkxVU0hfU0lOR0xFX1BBR0VdOworCQkJICAgICAgKyBidWZfcG9vbC0+
bl9mbHVzaFtCVUZfRkxVU0hfTElTVF07CiAKIAl9CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1Zi5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL2J1ZjBidWYuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjEw
NzUwMDYtZWx6NDN1aDlxcDAxNXdsZQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVm
MGJ1Zi5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA4MDMxOC01YmFv
ZzV6N2ExbzBxOTBqCkBAIC0zMDEsNyArMzAxLDYgQEAgYnVmX3BhZ2VfZ2V0X2ZsdXNoX3R5cGUo
CiAjaWZkZWYgVU5JVl9ERUJVRwogCXN3aXRjaCAoZmx1c2hfdHlwZSkgewogCWNhc2UgQlVGX0ZM
VVNIX0xSVToKLQljYXNlIEJVRl9GTFVTSF9TSU5HTEVfUEFHRToKIAljYXNlIEJVRl9GTFVTSF9M
SVNUOgogCQlyZXR1cm4oZmx1c2hfdHlwZSk7CiAJY2FzZSBCVUZfRkxVU0hfTl9UWVBFUzoKCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMHR5cGVzLmgnCi0t
LSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwdHlwZXMuaAlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMTAyMTA3NTAwNi1lbHo0M3VoOXFwMDE1d2xlCisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwdHlwZXMuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMTAyMTA4MDMxOC01YmFvZzV6N2ExbzBxOTBqCkBAIC00NSw3ICs0NSw2IEBAIHR5
cGVkZWYJYnl0ZQlidWZfZnJhbWVfdDsKIC8qKiBGbGFncyBmb3IgZmx1c2ggdHlwZXMgKi8KIGVu
dW0gYnVmX2ZsdXNoIHsKIAlCVUZfRkxVU0hfTFJVID0gMCwJCS8qITwgZmx1c2ggdmlhIHRoZSBM
UlUgbGlzdCAqLwotCUJVRl9GTFVTSF9TSU5HTEVfUEFHRSwJCS8qITwgZmx1c2ggYSBzaW5nbGUg
cGFnZSAqLwogCUJVRl9GTFVTSF9MSVNULAkJCS8qITwgZmx1c2ggdmlhIHRoZSBmbHVzaCBsaXN0
CiAJCQkJCW9mIGRpcnR5IGJsb2NrcyAqLwogCUJVRl9GTFVTSF9OX1RZUEVTCQkvKiE8IGluZGV4
IG9mIGxhc3QgZWxlbWVudCArIDEgICovCgo=

--===============0599463681==
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.6-innodb/
# testament_sha1: cd4f6efdbf629dc20434894cf437f2db9d82bade
# timestamp: 2010-10-21 11:03:25 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   elz43uh9qp015wle
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfmPA6EAA0VflBAwUm///3Pn
Xg6////wBAAIAFAFrInnNaAuHYwTW3OEkiAKYTaAyDUzUYUaepo2o09QyD1PUxAkkJNiaNCMhTTQ
0ABoAAABoBIkmQUeqeyGqZkxRo9Q0DCAAAaAHGTJkxGJgBMmCZADRhGAIYBJJE9NNJgEaEaajymn
qHpqDRoaDQ0A9Q949kwraMF4qkyW2Hrx8O84k2Rgnpx37eLpCmWXK7LDa0KlKWV1SVUp3TiMll9u
k+5bxrQuwm22Ngvb9PigrnWzBmLz54wYZdyIY3W9M7ZDZFkWN1ETdHEz/WfJZVg0r7X149Xl6Q85
6lzlcqrQ5ItQdEOC/TlJ2Zo/02KuxZ8ua1F2gotLgGxqcnBwp0V+URtw5JUHIA/aCQRYg5Kh6DGr
1Gp+OurhHJLruKfEAXtCgVaSo5FqVma1Y4TSg2QEMBtZNZpxDiEzB7QBiT3IIl1qBLmJCXKdZLiq
QThDUDSOzzcFdhNgy1mIoFpcUP60FwjQIgr0PYIUUyFErnQySV3wMrCVjCUZVqYRu2G+X3TSSuQQ
YhXPfYYEcyGYYrvpPGicU3yPUghtvHePYIxMTvw2UtaaZBpmamBrvwJyETh0gDPpshPuM82psL99
hfbthk+KCzijTMUvS0236ElIx5DZ3sCDZplR4ktC0QIuKQNRtmVuT9UGkpEyUEDwldU0OjsQUlrH
BUNWCnE0SBXyVV9DJXsiiDggnhOYeDmQbTIXYqYdfF1MCErttVFbGDLmhwhaxDnq4OO65AxVa0Rn
vz3CN3JIzQWmeayES2U21dhY9c27ZKLFBrZPWVSw4PrognuKU0ejbNAxJbY3ktkMoDYoHwtgmuQS
LCVSRgYwi6jmLjDBF5xEXlkzHgQ3uzpfnJI0QPpmwjEN6DEeWGBEn3HEx7FRnLBpXXjrc3T0jXd2
nOzndq9mkgd0CGvgWTEa8NH25NFjEyMqla6E7pHWWr4XuWjLCLTubO21F0Ai5DWtYEhRk0kHn7G7
AzR45zMJpBlwUm3eurYrEGsAj3xpZhgY5q3v8Yfz5hxDoSXly5oiUkamP0G93KDDGQ9AQQqVXeZu
CQNa4n9VsOawNjzjYmGHML3r2TQigOx6O03DkwixBmPWGmnYdsbXN6Sb42jw7wC73PogFuSXGzdO
sUQ1AiCVB5ypL5spN/u1cEGI4HALVMNfB8BjrMsryUhFSpag1nDXcRdvV4mdpjY9S15eFIHDdyDS
V60FV5JggttQbXoM1o0N8ppqpZgBwq0BhdSXbJyQnsJ0PRWaJGsHpUWHdm5kGogXivmQajcbAqKc
vb4g5ZxOSCwz2DiOHP0ufYaMSe0eW5FpWeZlY64ohVmuYuZ71okIa3XZ26cf1gjarm48klWm37qv
BwZ0yM+WnDHEyfXmJBPSdpUqBklXSa9WM0mIvykqjcUoNIXA9FrWxHetDjaOLNgjqAfZlGMOG8oE
9gJb/dh13UGfVmM9tNcqwJNDSGRA4xXfaKwVuMo65rXplmkjFRQLYXpdUSgrQXG0VSIG26El56Rb
qQDw7V0BWKtyQbl1UgDhfZdBVj0un7wgLaigKQB7bklzh3HqBk7ZgplJaa54mTIHlfHkTYsN47Ka
VwykC4CcBvdiB7qqUSqGicLPy8euEl5hEcsRFCxEERcXcU8/ABwFUpXKDaD7puvMUsmQ8OT43LrU
uGGPaI4KjIuyOcSNNc0aCbreEt9+2sAuT0TnSdSBp6pBnctsZr2hrc7lfaKFYjn7crBupEXI1DGA
19r17BWDXQvFdHHluJCmhyC6D0SlxUwqwtUI4LlpNBF3NdFFaj0ztoufzq+OTF6WVauEyyqcRCOA
T/4f2/8XckU4UJD5jwOh


--===============0599463681==--