From: marko.makela
Date: February 10 2011 9:16am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3492) Bug#60079
List-Archive: http://lists.mysql.com/commits/130978
X-Bug: 60079
Message-Id: <201102100917.p1A8xP44010440@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1275854779=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMTAwOTAzMzgtZnB4ZzMx
NWxyMnhlNjhiZwoKIDM0OTIgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xMAogICAgICBCdWcgIzYw
MDc5IGRpY3RfbG9hZF90YWJsZV9vbl9pZCgpIGNhbiBzY2FuIHRvbyBtYW55IHJlY29yZHMKICAg
ICAgCiAgICAgIGRpY3RfbG9hZF90YWJsZV9vbl9pZCgpOiBPbmx5IGNoZWNrIHRoZSBkZWxldGUt
bWFyayBmbGFnIG9uIHJlY29yZHMKICAgICAgdGhhdCBtYXRjaCB0YWJsZV9pZC4gUmVwbGFjZSBn
b3RvIGZ1bmNfZXhpdCB3aXRoIG5lc3RlZCBpZi1lbHNlLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9kaWN0
L2RpY3QwbG9hZC5jCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDExMDIxMDA5MDMzOC1m
cHhnMzE1bHIyeGU2OGJnCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxMDA5MTY1MC14MjRoZng0eHU0Z3Vl
N3Z6CkBAIC0xODU0LDQwICsxODU0LDQyIEBAIGRpY3RfbG9hZF90YWJsZV9vbl9pZCgKIAogCWJ0
cl9wY3VyX29wZW5fb25fdXNlcl9yZWMoc3lzX3RhYmxlX2lkcywgdHVwbGUsIFBBR0VfQ1VSX0dF
LAogCQkJCSAgQlRSX1NFQVJDSF9MRUFGLCAmcGN1ciwgJm10cik7Ci0JcmVjID0gYnRyX3BjdXJf
Z2V0X3JlYygmcGN1cik7Ci0KLQlpZiAoIWJ0cl9wY3VyX2lzX29uX3VzZXJfcmVjKCZwY3VyKSkg
ewotCQkvKiBOb3QgZm91bmQgKi8KLQkJZ290byBmdW5jX2V4aXQ7Ci0JfQotCi0JLyogRmluZCB0
aGUgZmlyc3QgcmVjb3JkIHRoYXQgaXMgbm90IGRlbGV0ZSBtYXJrZWQgKi8KLQl3aGlsZSAocmVj
X2dldF9kZWxldGVkX2ZsYWcocmVjLCAwKSkgewotCQlpZiAoIWJ0cl9wY3VyX21vdmVfdG9fbmV4
dF91c2VyX3JlYygmcGN1ciwgJm10cikpIHsKLQkJCWdvdG8gZnVuY19leGl0OwotCQl9Ci0JCXJl
YyA9IGJ0cl9wY3VyX2dldF9yZWMoJnBjdXIpOwotCX0KLQotCS8qLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKi8KLQkvKiBOb3cgd2UgaGF2ZSB0aGUg
cmVjb3JkIGluIHRoZSBzZWNvbmRhcnkgaW5kZXggY29udGFpbmluZyB0aGUKLQl0YWJsZSBJRCBh
bmQgTkFNRSAqLwogCitjaGVja19yZWM6CiAJcmVjID0gYnRyX3BjdXJfZ2V0X3JlYygmcGN1cik7
Ci0JZmllbGQgPSByZWNfZ2V0X250aF9maWVsZF9vbGQocmVjLCAwLCAmbGVuKTsKLQl1dF9hZChs
ZW4gPT0gOCk7CiAKLQkvKiBDaGVjayBpZiB0aGUgdGFibGUgaWQgaW4gcmVjb3JkIGlzIHRoZSBv
bmUgc2VhcmNoZWQgZm9yICovCi0JaWYgKHRhYmxlX2lkICE9IG1hY2hfcmVhZF9mcm9tXzgoZmll
bGQpKSB7Ci0JCWdvdG8gZnVuY19leGl0OworCWlmIChwYWdlX3JlY19pc191c2VyX3JlYyhyZWMp
KSB7CisJCS8qLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tKi8KKwkJLyogTm93IHdlIGhhdmUgdGhlIHJlY29yZCBpbiB0aGUgc2Vjb25kYXJ5IGluZGV4
CisJCWNvbnRhaW5pbmcgdGhlIHRhYmxlIElEIGFuZCBOQU1FICovCisKKwkJZmllbGQgPSByZWNf
Z2V0X250aF9maWVsZF9vbGQocmVjLCAwLCAmbGVuKTsKKwkJdXRfYWQobGVuID09IDgpOworCisJ
CS8qIENoZWNrIGlmIHRoZSB0YWJsZSBpZCBpbiByZWNvcmQgaXMgdGhlIG9uZSBzZWFyY2hlZCBm
b3IgKi8KKwkJaWYgKHRhYmxlX2lkID09IG1hY2hfcmVhZF9mcm9tXzgoZmllbGQpKSB7CisJCQlp
ZiAocmVjX2dldF9kZWxldGVkX2ZsYWcocmVjLCAwKSkgeworCQkJCS8qIFVudGlsIHB1cmdlIGhh
cyBjb21wbGV0ZWQsIHRoZXJlCisJCQkJbWF5IGJlIGRlbGV0ZS1tYXJrZWQgZHVwbGljYXRlIHJl
Y29yZHMKKwkJCQlmb3IgdGhlIHNhbWUgU1lTX1RBQkxFUy5JRC4KKwkJCQlEdWUgdG8gQnVnICM2
MDA0OSwgc29tZSBkZWxldGUtbWFya2VkCisJCQkJcmVjb3JkcyBtYXkgc3Vydml2ZSB0aGUgcHVy
Z2UgZm9yZXZlci4gKi8KKwkJCQlpZiAoYnRyX3BjdXJfbW92ZV90b19uZXh0KCZwY3VyLCAmbXRy
KSkgeworCisJCQkJCWdvdG8gY2hlY2tfcmVjOworCQkJCX0KKwkJCX0gZWxzZSB7CisJCQkJLyog
Tm93IHdlIGdldCB0aGUgdGFibGUgbmFtZSBmcm9tIHRoZSByZWNvcmQgKi8KKwkJCQlmaWVsZCA9
IHJlY19nZXRfbnRoX2ZpZWxkX29sZChyZWMsIDEsICZsZW4pOworCQkJCS8qIExvYWQgdGhlIHRh
YmxlIGRlZmluaXRpb24gdG8gbWVtb3J5ICovCisJCQkJdGFibGUgPSBkaWN0X2xvYWRfdGFibGUo
CisJCQkJCW1lbV9oZWFwX3N0cmR1cGwoCisJCQkJCQloZWFwLCAoY2hhciopIGZpZWxkLCBsZW4p
LAorCQkJCQlUUlVFLCBESUNUX0VSUl9JR05PUkVfTk9ORSk7CisJCQl9CisJCX0KIAl9CiAKLQkv
KiBOb3cgd2UgZ2V0IHRoZSB0YWJsZSBuYW1lIGZyb20gdGhlIHJlY29yZCAqLwotCWZpZWxkID0g
cmVjX2dldF9udGhfZmllbGRfb2xkKHJlYywgMSwgJmxlbik7Ci0JLyogTG9hZCB0aGUgdGFibGUg
ZGVmaW5pdGlvbiB0byBtZW1vcnkgKi8KLQl0YWJsZSA9IGRpY3RfbG9hZF90YWJsZShtZW1faGVh
cF9zdHJkdXBsKGhlYXAsIChjaGFyKikgZmllbGQsIGxlbiksCi0JCQkJVFJVRSwgRElDVF9FUlJf
SUdOT1JFX05PTkUpOwotZnVuY19leGl0OgogCWJ0cl9wY3VyX2Nsb3NlKCZwY3VyKTsKIAltdHJf
Y29tbWl0KCZtdHIpOwogCW1lbV9oZWFwX2ZyZWUoaGVhcCk7Cgo=

--===============1275854779==
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: b3e9e50d8269b01678d19027ec031d18f46fc6aa
# timestamp: 2011-02-10 11:16:58 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: jimmy.yang@stripped\
#   fpxg315lr2xe68bg
# 
# Begin bundle
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
F3JFOFCQpLYZVA==


--===============1275854779==--