From: marko.makela
Date: February 10 2011 9:59am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3491 to 3492) Bug#60079
List-Archive: http://lists.mysql.com/commits/130995
X-Bug: 60079
Message-Id: <201102100959.p1A9wuKR025070@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1370355508=="

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

IDM0OTIgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xMAogICAgICBCdWcgIzYwMDc5IGRpY3RfbG9h
ZF90YWJsZV9vbl9pZCgpIGNhbiBzY2FuIHRvbyBtYW55IHJlY29yZHMKICAgICAgCiAgICAgIGRp
Y3RfbG9hZF90YWJsZV9vbl9pZCgpOiBPbmx5IGNoZWNrIHRoZSBkZWxldGUtbWFyayBmbGFnIG9u
IHJlY29yZHMKICAgICAgdGhhdCBtYXRjaCB0YWJsZV9pZC4gUmVwbGFjZSBnb3RvIGZ1bmNfZXhp
dCB3aXRoIG5lc3RlZCBpZi1lbHNlLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL2RpY3QvZGljdDBsb2FkLmMKIDM0OTEgSmltbXkgWWFuZwkyMDExLTAyLTEwIFttZXJnZV0K
ICAgICAgTWVyZ2UgZnJvbSBteXNxbC01LjUtaW5ub2RiIHRvIG15c3FsLXRydW5rLWlubm9kYi4K
CiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTM3
NTYucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzUzNzU2
LW1hc3Rlci5vcHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNTM3
NTYudGVzdAogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxv
YWQuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5j
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6amltbXkueWFu
Z0BvcmFjbGUuY29tLTIwMTEwMjEwMDkwMzM4LWZweGczMTVscjJ4ZTY4YmcKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTEwMjEwMDkxNjUwLXgyNGhmeDR4dTRndWU3dnoKQEAgLTE4NTQsNDAgKzE4NTQsNDIgQEAg
ZGljdF9sb2FkX3RhYmxlX29uX2lkKAogCiAJYnRyX3BjdXJfb3Blbl9vbl91c2VyX3JlYyhzeXNf
dGFibGVfaWRzLCB0dXBsZSwgUEFHRV9DVVJfR0UsCiAJCQkJICBCVFJfU0VBUkNIX0xFQUYsICZw
Y3VyLCAmbXRyKTsKLQlyZWMgPSBidHJfcGN1cl9nZXRfcmVjKCZwY3VyKTsKLQotCWlmICghYnRy
X3BjdXJfaXNfb25fdXNlcl9yZWMoJnBjdXIpKSB7Ci0JCS8qIE5vdCBmb3VuZCAqLwotCQlnb3Rv
IGZ1bmNfZXhpdDsKLQl9Ci0KLQkvKiBGaW5kIHRoZSBmaXJzdCByZWNvcmQgdGhhdCBpcyBub3Qg
ZGVsZXRlIG1hcmtlZCAqLwotCXdoaWxlIChyZWNfZ2V0X2RlbGV0ZWRfZmxhZyhyZWMsIDApKSB7
Ci0JCWlmICghYnRyX3BjdXJfbW92ZV90b19uZXh0X3VzZXJfcmVjKCZwY3VyLCAmbXRyKSkgewot
CQkJZ290byBmdW5jX2V4aXQ7Ci0JCX0KLQkJcmVjID0gYnRyX3BjdXJfZ2V0X3JlYygmcGN1cik7
Ci0JfQotCi0JLyotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0qLwotCS8qIE5vdyB3ZSBoYXZlIHRoZSByZWNvcmQgaW4gdGhlIHNlY29uZGFyeSBpbmRl
eCBjb250YWluaW5nIHRoZQotCXRhYmxlIElEIGFuZCBOQU1FICovCiAKK2NoZWNrX3JlYzoKIAly
ZWMgPSBidHJfcGN1cl9nZXRfcmVjKCZwY3VyKTsKLQlmaWVsZCA9IHJlY19nZXRfbnRoX2ZpZWxk
X29sZChyZWMsIDAsICZsZW4pOwotCXV0X2FkKGxlbiA9PSA4KTsKIAotCS8qIENoZWNrIGlmIHRo
ZSB0YWJsZSBpZCBpbiByZWNvcmQgaXMgdGhlIG9uZSBzZWFyY2hlZCBmb3IgKi8KLQlpZiAodGFi
bGVfaWQgIT0gbWFjaF9yZWFkX2Zyb21fOChmaWVsZCkpIHsKLQkJZ290byBmdW5jX2V4aXQ7CisJ
aWYgKHBhZ2VfcmVjX2lzX3VzZXJfcmVjKHJlYykpIHsKKwkJLyotLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0qLworCQkvKiBOb3cgd2UgaGF2ZSB0aGUg
cmVjb3JkIGluIHRoZSBzZWNvbmRhcnkgaW5kZXgKKwkJY29udGFpbmluZyB0aGUgdGFibGUgSUQg
YW5kIE5BTUUgKi8KKworCQlmaWVsZCA9IHJlY19nZXRfbnRoX2ZpZWxkX29sZChyZWMsIDAsICZs
ZW4pOworCQl1dF9hZChsZW4gPT0gOCk7CisKKwkJLyogQ2hlY2sgaWYgdGhlIHRhYmxlIGlkIGlu
IHJlY29yZCBpcyB0aGUgb25lIHNlYXJjaGVkIGZvciAqLworCQlpZiAodGFibGVfaWQgPT0gbWFj
aF9yZWFkX2Zyb21fOChmaWVsZCkpIHsKKwkJCWlmIChyZWNfZ2V0X2RlbGV0ZWRfZmxhZyhyZWMs
IDApKSB7CisJCQkJLyogVW50aWwgcHVyZ2UgaGFzIGNvbXBsZXRlZCwgdGhlcmUKKwkJCQltYXkg
YmUgZGVsZXRlLW1hcmtlZCBkdXBsaWNhdGUgcmVjb3JkcworCQkJCWZvciB0aGUgc2FtZSBTWVNf
VEFCTEVTLklELgorCQkJCUR1ZSB0byBCdWcgIzYwMDQ5LCBzb21lIGRlbGV0ZS1tYXJrZWQKKwkJ
CQlyZWNvcmRzIG1heSBzdXJ2aXZlIHRoZSBwdXJnZSBmb3JldmVyLiAqLworCQkJCWlmIChidHJf
cGN1cl9tb3ZlX3RvX25leHQoJnBjdXIsICZtdHIpKSB7CisKKwkJCQkJZ290byBjaGVja19yZWM7
CisJCQkJfQorCQkJfSBlbHNlIHsKKwkJCQkvKiBOb3cgd2UgZ2V0IHRoZSB0YWJsZSBuYW1lIGZy
b20gdGhlIHJlY29yZCAqLworCQkJCWZpZWxkID0gcmVjX2dldF9udGhfZmllbGRfb2xkKHJlYywg
MSwgJmxlbik7CisJCQkJLyogTG9hZCB0aGUgdGFibGUgZGVmaW5pdGlvbiB0byBtZW1vcnkgKi8K
KwkJCQl0YWJsZSA9IGRpY3RfbG9hZF90YWJsZSgKKwkJCQkJbWVtX2hlYXBfc3RyZHVwbCgKKwkJ
CQkJCWhlYXAsIChjaGFyKikgZmllbGQsIGxlbiksCisJCQkJCVRSVUUsIERJQ1RfRVJSX0lHTk9S
RV9OT05FKTsKKwkJCX0KKwkJfQogCX0KIAotCS8qIE5vdyB3ZSBnZXQgdGhlIHRhYmxlIG5hbWUg
ZnJvbSB0aGUgcmVjb3JkICovCi0JZmllbGQgPSByZWNfZ2V0X250aF9maWVsZF9vbGQocmVjLCAx
LCAmbGVuKTsKLQkvKiBMb2FkIHRoZSB0YWJsZSBkZWZpbml0aW9uIHRvIG1lbW9yeSAqLwotCXRh
YmxlID0gZGljdF9sb2FkX3RhYmxlKG1lbV9oZWFwX3N0cmR1cGwoaGVhcCwgKGNoYXIqKSBmaWVs
ZCwgbGVuKSwKLQkJCQlUUlVFLCBESUNUX0VSUl9JR05PUkVfTk9ORSk7Ci1mdW5jX2V4aXQ6CiAJ
YnRyX3BjdXJfY2xvc2UoJnBjdXIpOwogCW10cl9jb21taXQoJm10cik7CiAJbWVtX2hlYXBfZnJl
ZShoZWFwKTsKCg==

--===============1370355508==
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:59:21 +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==


--===============1370355508==--