From: marko.makela
Date: February 2 2011 12:05pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3697) Bug#55284
List-Archive: http://lists.mysql.com/commits/130210
X-Bug: 55284
Message-Id: <201102021205.p12C5Zkl017541@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0485570983=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEzMTA3NTY1MS0wMzk0
dDNwcHI2YW8yZXMzCgogMzY5NyBNYXJrbyBNw6RrZWzDpAkyMDExLTAyLTAyCiAgICAgIEJ1ZyAj
NTUyODQgZGlhZ25vc3RpY3M6IEVuYWJsZSBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgYnkgVU5J
Vl9ERUJVRwogICAgICAKICAgICAgSXQgd2FzIHRoZSBlbmFibGluZyBvZiBVTklWX0RFQlVHX0ZJ
TEVfQUNDRVNTRVMgdGhhdCBjYXVnaHQgQnVnICM1NTI4NAogICAgICBpbiB0aGUgZmlyc3QgcGxh
Y2UuIFRoaXMgaXMgYSB2ZXJ5IGxpZ2h0IHBpZWNlIG9mIG9mIGRlYnVnIGNvZGUsIGFuZAogICAg
ICB0aGVyZSByZWFsbHkgaXMgbm8gcmVhc29uIHdoeSBpdCBpcyBub3QgZW5hYmxlZCBpbiBhbGwg
ZGVidWcgYnVpbGRzLgogICAgICAKICAgICAgcmI6Ly81NTEgYXBwcm92ZWQgYnkgSmltbXkgWWFu
ZwoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBidWYu
YwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZnNwL2ZzcDBmc3AuYwogICAgICBzdG9yYWdl
L2lubm9kYl9wbHVnaW4vaWJ1Zi9pYnVmMGlidWYuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVn
aW4vaW5jbHVkZS9idWYwYnVmLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUv
dW5pdi5pCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBi
dWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVmLmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMzEwNzU2NTEtMDM5NHQzcHByNmFvMmVzMworKysg
Yi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBidWYuYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDExMDIwMjEyMDUxMi14YXl2NDlsbzUwanNiang3CkBAIC02NTcsOSArNjU3
LDkgQEAgYnVmX2Jsb2NrX2luaXQoCiAKIAlibG9jay0+bW9kaWZ5X2Nsb2NrID0gMDsKIAotI2lm
ZGVmIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUworI2lmIGRlZmluZWQgVU5JVl9ERUJVR19GSUxF
X0FDQ0VTU0VTIHx8IGRlZmluZWQgVU5JVl9ERUJVRwogCWJsb2NrLT5wYWdlLmZpbGVfcGFnZV93
YXNfZnJlZWQgPSBGQUxTRTsKLSNlbmRpZiAvKiBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgKi8K
KyNlbmRpZiAvKiBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgfHwgVU5JVl9ERUJVRyAqLwogCiAJ
YmxvY2stPmNoZWNrX2luZGV4X3BhZ2VfYXRfZmx1c2ggPSBGQUxTRTsKIAlibG9jay0+aW5kZXgg
PSBOVUxMOwpAQCAtMTYwMCw3ICsxNjAwLDcgQEAgYnVmX3BhZ2VfcGVla19pZl9zZWFyY2hfaGFz
aGVkKAogCXJldHVybihpc19oYXNoZWQpOwogfQogCi0jaWZkZWYgVU5JVl9ERUJVR19GSUxFX0FD
Q0VTU0VTCisjaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgfHwgZGVmaW5lZCBV
TklWX0RFQlVHCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBTZXRzIGZpbGVfcGFnZV93YXNfZnJlZWQgVFJV
RSBpZiB0aGUgcGFnZSBpcyBmb3VuZCBpbiB0aGUgYnVmZmVyIHBvb2wuCiBUaGlzIGZ1bmN0aW9u
IHNob3VsZCBiZSBjYWxsZWQgd2hlbiB3ZSBmcmVlIGEgZmlsZSBwYWdlIGFuZCB3YW50IHRoZQpA
QCAtMTYyMSw2ICsxNjIxLDggQEAgYnVmX3BhZ2Vfc2V0X2ZpbGVfcGFnZV93YXNfZnJlZWQoCiAJ
YnBhZ2UgPSBidWZfcGFnZV9oYXNoX2dldChzcGFjZSwgb2Zmc2V0KTsKIAogCWlmIChicGFnZSkg
eworCQkvKiBicGFnZS0+ZmlsZV9wYWdlX3dhc19mcmVlZCBjYW4gYWxyZWFkeSBob2xkCisJCXdo
ZW4gdGhpcyBjb2RlIGlzIGludm9rZWQgZnJvbSBkaWN0X2Ryb3BfaW5kZXhfdHJlZSgpICovCiAJ
CWJwYWdlLT5maWxlX3BhZ2Vfd2FzX2ZyZWVkID0gVFJVRTsKIAl9CiAKQEAgLTE2NTYsNyArMTY1
OCw3IEBAIGJ1Zl9wYWdlX3Jlc2V0X2ZpbGVfcGFnZV93YXNfZnJlZWQoCiAKIAlyZXR1cm4oYnBh
Z2UpOwogfQotI2VuZGlmIC8qIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyAqLworI2VuZGlmIC8q
IFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8fCBVTklWX0RFQlVHICovCiAKIC8qKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ki8vKioKIEdldCByZWFkIGFjY2VzcyB0byBhIGNvbXByZXNzZWQgcGFnZSAodXN1YWxseSBvZiB0
eXBlCkBAIC0xNzUzLDcgKzE3NTUsNyBAQCBnb3RfYmxvY2s6CiAKIAlidWZfcGFnZV9zZXRfYWNj
ZXNzZWRfbWFrZV95b3VuZyhicGFnZSwgYWNjZXNzX3RpbWUpOwogCi0jaWZkZWYgVU5JVl9ERUJV
R19GSUxFX0FDQ0VTU0VTCisjaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgfHwg
ZGVmaW5lZCBVTklWX0RFQlVHCiAJdXRfYSghYnBhZ2UtPmZpbGVfcGFnZV93YXNfZnJlZWQpOwog
I2VuZGlmCiAKQEAgLTIzMjEsNyArMjMyMyw3IEBAIHdhaXRfdW50aWxfdW5maXhlZDoKIAogCWJ1
Zl9wYWdlX3NldF9hY2Nlc3NlZF9tYWtlX3lvdW5nKCZibG9jay0+cGFnZSwgYWNjZXNzX3RpbWUp
OwogCi0jaWZkZWYgVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTCisjaWYgZGVmaW5lZCBVTklWX0RF
QlVHX0ZJTEVfQUNDRVNTRVMgfHwgZGVmaW5lZCBVTklWX0RFQlVHCiAJdXRfYSghYmxvY2stPnBh
Z2UuZmlsZV9wYWdlX3dhc19mcmVlZCk7CiAjZW5kaWYKIApAQCAtMjQ3OSw3ICsyNDgxLDcgQEAg
YnVmX3BhZ2Vfb3B0aW1pc3RpY19nZXQoCiAJdXRfYShidWZfYmxvY2tfZ2V0X3N0YXRlKGJsb2Nr
KSA9PSBCVUZfQkxPQ0tfRklMRV9QQUdFKTsKICNlbmRpZiAvKiBVTklWX0RFQlVHIHx8IFVOSVZf
QlVGX0RFQlVHICovCiAKLSNpZmRlZiBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMKKyNpZiBkZWZp
bmVkIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8fCBkZWZpbmVkIFVOSVZfREVCVUcKIAl1dF9h
KGJsb2NrLT5wYWdlLmZpbGVfcGFnZV93YXNfZnJlZWQgPT0gRkFMU0UpOwogI2VuZGlmCiAJaWYg
KFVOSVZfVU5MSUtFTFkoIWFjY2Vzc190aW1lKSkgewpAQCAtMjU4Nyw3ICsyNTg5LDcgQEAgYnVm
X3BhZ2VfZ2V0X2tub3duX25vd2FpdCgKIAl1dF9hKGJsb2NrLT5wYWdlLmJ1Zl9maXhfY291bnQg
PiAwKTsKIAl1dF9hKGJ1Zl9ibG9ja19nZXRfc3RhdGUoYmxvY2spID09IEJVRl9CTE9DS19GSUxF
X1BBR0UpOwogI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CVUZfREVCVUcgKi8KLSNpZmRl
ZiBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUdfRklMRV9B
Q0NFU1NFUyB8fCBkZWZpbmVkIFVOSVZfREVCVUcKIAl1dF9hKGJsb2NrLT5wYWdlLmZpbGVfcGFn
ZV93YXNfZnJlZWQgPT0gRkFMU0UpOwogI2VuZGlmCiAKQEAgLTI2NzAsOSArMjY3Miw5IEBAIGJ1
Zl9wYWdlX3RyeV9nZXRfZnVuYygKIAl1dF9hKGJsb2NrLT5wYWdlLmJ1Zl9maXhfY291bnQgPiAw
KTsKIAl1dF9hKGJ1Zl9ibG9ja19nZXRfc3RhdGUoYmxvY2spID09IEJVRl9CTE9DS19GSUxFX1BB
R0UpOwogI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CVUZfREVCVUcgKi8KLSNpZmRlZiBV
TklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUdfRklMRV9BQ0NF
U1NFUyB8fCBkZWZpbmVkIFVOSVZfREVCVUcKIAl1dF9hKGJsb2NrLT5wYWdlLmZpbGVfcGFnZV93
YXNfZnJlZWQgPT0gRkFMU0UpOwotI2VuZGlmIC8qIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyAq
LworI2VuZGlmIC8qIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8fCBVTklWX0RFQlVHICovCiAJ
YnVmX2Jsb2NrX2RiZ19hZGRfbGV2ZWwoYmxvY2ssIFNZTkNfTk9fT1JERVJfQ0hFQ0spOwogCiAJ
YnVmX3Bvb2wtPnN0YXQubl9wYWdlX2dldHMrKzsKQEAgLTI3MDEsOSArMjcwMyw5IEBAIGJ1Zl9w
YWdlX2luaXRfbG93KAogCWJwYWdlLT5uZXdlc3RfbW9kaWZpY2F0aW9uID0gMDsKIAlicGFnZS0+
b2xkZXN0X21vZGlmaWNhdGlvbiA9IDA7CiAJSEFTSF9JTlZBTElEQVRFKGJwYWdlLCBoYXNoKTsK
LSNpZmRlZiBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUdf
RklMRV9BQ0NFU1NFUyB8fCBkZWZpbmVkIFVOSVZfREVCVUcKIAlicGFnZS0+ZmlsZV9wYWdlX3dh
c19mcmVlZCA9IEZBTFNFOwotI2VuZGlmIC8qIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyAqLwor
I2VuZGlmIC8qIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8fCBVTklWX0RFQlVHICovCiB9CiAK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKQEAgLTMwMDksOSArMzAxMSw5IEBAIGJ1Zl9wYWdlX2NyZWF0ZSgK
ICNpZmRlZiBVTklWX0lCVUZfQ09VTlRfREVCVUcKIAkJdXRfYShpYnVmX2NvdW50X2dldChzcGFj
ZSwgb2Zmc2V0KSA9PSAwKTsKICNlbmRpZgotI2lmZGVmIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NF
UworI2lmIGRlZmluZWQgVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTIHx8IGRlZmluZWQgVU5JVl9E
RUJVRwogCQlibG9jay0+cGFnZS5maWxlX3BhZ2Vfd2FzX2ZyZWVkID0gRkFMU0U7Ci0jZW5kaWYg
LyogVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTICovCisjZW5kaWYgLyogVU5JVl9ERUJVR19GSUxF
X0FDQ0VTU0VTIHx8IFVOSVZfREVCVUcgKi8KIAogCQkvKiBQYWdlIGNhbiBiZSBmb3VuZCBpbiBi
dWZfcG9vbCAqLwogCQlidWZfcG9vbF9tdXRleF9leGl0KCk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2ZzcC9mc3AwZnNwLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9mc3AvZnNwMGZzcC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MTMxMDc1NjUxLTAzOTR0M3BwcjZhbzJlczMKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2Zz
cC9mc3AwZnNwLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMDIxMjA1MTIt
eGF5djQ5bG81MGpzYmp4NwpAQCAtMzQ0NCw5ICszNDQ0LDkgQEAgZnNlZ19mcmVlX3BhZ2UoCiAK
IAlmc2VnX2ZyZWVfcGFnZV9sb3coc2VnX2lub2RlLCBzcGFjZSwgemlwX3NpemUsIHBhZ2UsIG10
cik7CiAKLSNpZmRlZiBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMKKyNpZiBkZWZpbmVkIFVOSVZf
REVCVUdfRklMRV9BQ0NFU1NFUyB8fCBkZWZpbmVkIFVOSVZfREVCVUcKIAlidWZfcGFnZV9zZXRf
ZmlsZV9wYWdlX3dhc19mcmVlZChzcGFjZSwgcGFnZSk7Ci0jZW5kaWYKKyNlbmRpZiAvKiBVTklW
X0RFQlVHX0ZJTEVfQUNDRVNTRVMgfHwgVU5JVl9ERUJVRyAqLwogfQogCiAvKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ki8vKioKQEAgLTM1MTMsMTMgKzM1MTMsMTMgQEAgZnNlZ19mcmVlX2V4dGVudCgKIAogCWZzcF9m
cmVlX2V4dGVudChzcGFjZSwgemlwX3NpemUsIHBhZ2UsIG10cik7CiAKLSNpZmRlZiBVTklWX0RF
QlVHX0ZJTEVfQUNDRVNTRVMKKyNpZiBkZWZpbmVkIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8
fCBkZWZpbmVkIFVOSVZfREVCVUcKIAlmb3IgKGkgPSAwOyBpIDwgRlNQX0VYVEVOVF9TSVpFOyBp
KyspIHsKIAogCQlidWZfcGFnZV9zZXRfZmlsZV9wYWdlX3dhc19mcmVlZChzcGFjZSwKIAkJCQkJ
CSBmaXJzdF9wYWdlX2luX2V4dGVudCArIGkpOwogCX0KLSNlbmRpZgorI2VuZGlmIC8qIFVOSVZf
REVCVUdfRklMRV9BQ0NFU1NFUyB8fCBVTklWX0RFQlVHICovCiB9CiAKIC8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pYnVmL2lidWYw
aWJ1Zi5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaWJ1Zi9pYnVmMGlidWYuYwlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEzMTA3NTY1MS0wMzk0dDNwcHI2YW8yZXMz
CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pYnVmL2lidWYwaWJ1Zi5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjAyMTIwNTEyLXhheXY0OWxvNTBqc2JqeDcKQEAgLTE4
NzgsOSArMTg3OCw5IEBAIGlidWZfcmVtb3ZlX2ZyZWVfcGFnZSh2b2lkKQogCWZzZWdfZnJlZV9w
YWdlKGhlYWRlcl9wYWdlICsgSUJVRl9IRUFERVIgKyBJQlVGX1RSRUVfU0VHX0hFQURFUiwKIAkJ
ICAgICAgIElCVUZfU1BBQ0VfSUQsIHBhZ2Vfbm8sICZtdHIpOwogCi0jaWZkZWYgVU5JVl9ERUJV
R19GSUxFX0FDQ0VTU0VTCisjaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgfHwg
ZGVmaW5lZCBVTklWX0RFQlVHCiAJYnVmX3BhZ2VfcmVzZXRfZmlsZV9wYWdlX3dhc19mcmVlZChJ
QlVGX1NQQUNFX0lELCBwYWdlX25vKTsKLSNlbmRpZgorI2VuZGlmIC8qIFVOSVZfREVCVUdfRklM
RV9BQ0NFU1NFUyB8fCBVTklWX0RFQlVHICovCiAKIAlpYnVmX2VudGVyKCk7CiAKQEAgLTE5MjIs
OSArMTkyMiw5IEBAIGlidWZfcmVtb3ZlX2ZyZWVfcGFnZSh2b2lkKQogCWlidWZfYml0bWFwX3Bh
Z2Vfc2V0X2JpdHMoCiAJCWJpdG1hcF9wYWdlLCBwYWdlX25vLCB6aXBfc2l6ZSwgSUJVRl9CSVRN
QVBfSUJVRiwgRkFMU0UsICZtdHIpOwogCi0jaWZkZWYgVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VT
CisjaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgfHwgZGVmaW5lZCBVTklWX0RF
QlVHCiAJYnVmX3BhZ2Vfc2V0X2ZpbGVfcGFnZV93YXNfZnJlZWQoSUJVRl9TUEFDRV9JRCwgcGFn
ZV9ubyk7Ci0jZW5kaWYKKyNlbmRpZiAvKiBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgfHwgVU5J
Vl9ERUJVRyAqLwogCW10cl9jb21taXQoJm10cik7CiAKIAltdXRleF9leGl0KCZpYnVmX211dGV4
KTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idWYw
YnVmLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J1ZjBidWYuaAlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEzMTA3NTY1MS0wMzk0dDNwcHI2YW8yZXMz
CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J1ZjBidWYuaAlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIwMjEyMDUxMi14YXl2NDlsbzUwanNiang3CkBAIC0z
NjgsNyArMzY4LDcgQEAgYnVmX3Jlc2V0X2NoZWNrX2luZGV4X3BhZ2VfYXRfZmx1c2goCiAvKj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KIAl1bGludAlzcGFjZSwJLyohPCBpbjog
c3BhY2UgaWQgKi8KIAl1bGludAlvZmZzZXQpOy8qITwgaW46IHBhZ2UgbnVtYmVyICovCi0jaWZk
ZWYgVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTCisjaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVf
QUNDRVNTRVMgfHwgZGVmaW5lZCBVTklWX0RFQlVHCiAvKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBTZXRzIGZp
bGVfcGFnZV93YXNfZnJlZWQgVFJVRSBpZiB0aGUgcGFnZSBpcyBmb3VuZCBpbiB0aGUgYnVmZmVy
IHBvb2wuCiBUaGlzIGZ1bmN0aW9uIHNob3VsZCBiZSBjYWxsZWQgd2hlbiB3ZSBmcmVlIGEgZmls
ZSBwYWdlIGFuZCB3YW50IHRoZQpAQCAtMzkzLDcgKzM5Myw3IEBAIGJ1Zl9wYWdlX3Jlc2V0X2Zp
bGVfcGFnZV93YXNfZnJlZWQoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwog
CXVsaW50CXNwYWNlLAkvKiE8IGluOiBzcGFjZSBpZCAqLwogCXVsaW50CW9mZnNldCk7CS8qITwg
aW46IHBhZ2UgbnVtYmVyICovCi0jZW5kaWYgLyogVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTICov
CisjZW5kaWYgLyogVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTIHx8IFVOSVZfREVCVUcgKi8KIC8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKIFJlYWRzIHRoZSBmcmVlZF9wYWdlX2Nsb2NrIG9mIGEgYnVmZmVyIGJs
b2NrLgogQHJldHVybglmcmVlZF9wYWdlX2Nsb2NrICovCkBAIC0xMTM1LDExICsxMTM1LDExIEBA
IHN0cnVjdCBidWZfcGFnZV9zdHJ1Y3R7CiAJCQkJCTAgaWYgdGhlIGJsb2NrIHdhcyBuZXZlciBh
Y2Nlc3NlZAogCQkJCQlpbiB0aGUgYnVmZmVyIHBvb2wgKi8KIAkvKiBAfSAqLwotIyBpZmRlZiBV
TklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMKKyMgaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVfQUND
RVNTRVMgfHwgZGVmaW5lZCBVTklWX0RFQlVHCiAJaWJvb2wJCWZpbGVfcGFnZV93YXNfZnJlZWQ7
CiAJCQkJCS8qITwgdGhpcyBpcyBzZXQgdG8gVFJVRSB3aGVuIGZzcAogCQkJCQlmcmVlcyBhIHBh
Z2UgaW4gYnVmZmVyIHBvb2wgKi8KLSMgZW5kaWYgLyogVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VT
ICovCisjIGVuZGlmIC8qIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8fCBVTklWX0RFQlVHICov
CiAjZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICovCiB9OwogCgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTAxMzEwNzU2NTEtMDM5NHQzcHByNmFvMmVzMworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
aW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMDIxMjA1
MTIteGF5djQ5bG81MGpzYmp4NwpAQCAtMTgyLDkgKzE4Miw4IEBAIGNvbW1hbmQuIE5vdCB0ZXN0
ZWQgb24gV2luZG93cy4gKi8KICNkZWZpbmUgVU5JVl9ERUJVR19MT0NLX1ZBTElEQVRFCQkvKiBF
bmFibGUKIAkJCQkJCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoKSkKIAkJCQkJCWFzc2Vy
dGlvbnMuICovCi0jZGVmaW5lIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUwkJLyogRGVidWcgLmli
ZCBmaWxlIGFjY2VzcwotCQkJCQkJKGZpZWxkIGZpbGVfcGFnZV93YXNfZnJlZWQKLQkJCQkJCWlu
IGJ1Zl9wYWdlX3QpICovCisjZGVmaW5lIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUwkJLyogRW5h
YmxlIGZyZWVkIGJsb2NrIGFjY2VzcworCQkJCQkJZGVidWdnaW5nIHdpdGhvdXQgVU5JVl9ERUJV
RyAqLwogI2RlZmluZSBVTklWX0xSVV9ERUJVRwkJCQkvKiBkZWJ1ZyB0aGUgYnVmZmVyIHBvb2wg
TFJVICovCiAjZGVmaW5lIFVOSVZfSEFTSF9ERUJVRwkJCQkvKiBkZWJ1ZyBIQVNIXyBtYWNyb3Mg
Ki8KICNkZWZpbmUgVU5JVl9MSVNUX0RFQlVHCQkJCS8qIGRlYnVnIFVUX0xJU1RfIG1hY3JvcyAq
LwoK

--===============0485570983==
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: 45dc4ecc737b09d3ec337c24759653b1ad915d7e
# timestamp: 2011-02-02 14:05:26 +0200
# base_revision_id: marko.makela@stripped\
#   0394t3ppr6ao2es3
# 
# Begin bundle
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


--===============0485570983==--