From: marko.makela
Date: January 27 2011 11:46am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3465)
List-Archive: http://lists.mysql.com/commits/129746
Message-Id: <201101271146.p0RBEw5i003113@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0686004015=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAxMjcwOTQ4NDEtYnF6bDBu
em05c254OTVuMQoKIDM0NjUgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNyBbbWVyZ2VdCiAgICAg
IE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHRyeC5oCiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3RyeDB0cnguaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Ry
eDB0cnguaAlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAxMjcwOTQ4NDEtYnF6bDBu
em05c254OTVuMQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHRyeC5oCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI3MTE0NTE1LTNoY3NobmJmaXE1cXJ5cTYK
QEAgLTE3MywxMyArMTczLDE0IEBAIHRyeF9yZWNvdmVyX2Zvcl9teXNxbCgKIC8qKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgogVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIGZpbmQgb25lIFgvT3BlbiBYQSBkaXN0cmli
dXRlZCB0cmFuc2FjdGlvbgogd2hpY2ggaXMgaW4gdGhlIHByZXBhcmVkIHN0YXRlCi1AcmV0dXJu
CXRyeCBvciBOVUxMOyBub3RlIHRoYXQgdGhlIHRyeCBtYXkgaGF2ZSBiZWVuIGNvbW1pdHRlZCwK
LXVubGVzcyB0aGUgY2FsbGVyIGlzIGhvbGRpbmcgbG9ja19zeXMtPm11dGV4ICovCitAcmV0dXJu
CXRyeCBvciBOVUxMOyBvbiBtYXRjaCwgdGhlIHRyeC0+eGlkIHdpbGwgYmUgaW52YWxpZGF0ZWQ7
Citub3RlIHRoYXQgdGhlIHRyeCBtYXkgaGF2ZSBiZWVuIGNvbW1pdHRlZCwgdW5sZXNzIHRoZSBj
YWxsZXIgaXMKK2hvbGRpbmcgbG9ja19zeXMtPm11dGV4ICovCiBVTklWX0lOVEVSTgogdHJ4X3Qg
KgogdHJ4X2dldF90cnhfYnlfeGlkKAogLyo9PT09PT09PT09PT09PT0qLwotCWNvbnN0IFhJRCoJ
eGlkKTsJLyohPCBpbjogWC9PcGVuIFhBIHRyYW5zYWN0aW9uIGlkZW50aWZpY2F0aW9uICovCisJ
Y29uc3QgWElEKgl4aWQpOwkvKiE8IGluOiBYL09wZW4gWEEgdHJhbnNhY3Rpb24gaWRlbnRpZmll
ciAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKiovLyoqCiBJZiByZXF1aXJlZCwgZmx1c2hlcyB0aGUgbG9nIHRv
IGRpc2sgaWYgd2UgY2FsbGVkIHRyeF9jb21taXRfZm9yX215c3FsKCkKIHdpdGggdHJ4LT5mbHVz
aF9sb2dfbGF0ZXIgPT0gVFJVRS4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L3RyeC90cngwdHJ4LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwlyZXZp
ZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAxMjcwOTQ4NDEtYnF6bDBuem05c254OTVuMQor
KysgYi9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwdHJ4LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTAxMjcxMTQ1MTUtM2hjc2huYmZpcTVxcnlxNgpAQCAtMTY0NiwxOSArMTY0
NiwyMCBAQCB0cnhfcmVjb3Zlcl9mb3JfbXlzcWwoCiAvKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFRoaXMgZnVu
Y3Rpb24gaXMgdXNlZCB0byBmaW5kIG9uZSBYL09wZW4gWEEgZGlzdHJpYnV0ZWQgdHJhbnNhY3Rp
b24KIHdoaWNoIGlzIGluIHRoZSBwcmVwYXJlZCBzdGF0ZQotQHJldHVybgl0cnggb3IgTlVMTDsg
bm90ZSB0aGF0IHRoZSB0cnggbWF5IGhhdmUgYmVlbiBjb21taXR0ZWQsCi11bmxlc3MgdGhlIGNh
bGxlciBpcyBob2xkaW5nIGxvY2tfc3lzLT5tdXRleCAqLworQHJldHVybgl0cnggb3IgTlVMTDsg
b24gbWF0Y2gsIHRoZSB0cngtPnhpZCB3aWxsIGJlIGludmFsaWRhdGVkOworbm90ZSB0aGF0IHRo
ZSB0cnggbWF5IGhhdmUgYmVlbiBjb21taXR0ZWQsIHVubGVzcyB0aGUgY2FsbGVyIGlzCitob2xk
aW5nIGxvY2tfc3lzLT5tdXRleCAqLwogVU5JVl9JTlRFUk4KIHRyeF90KgogdHJ4X2dldF90cnhf
YnlfeGlkKAogLyo9PT09PT09PT09PT09PT0qLwotCWNvbnN0IFhJRCoJeGlkKQkvKiE8IGluOiBY
L09wZW4gWEEgdHJhbnNhY3Rpb24gaWRlbnRpZmljYXRpb24gKi8KKwljb25zdCBYSUQqCXhpZCkJ
LyohPCBpbjogWC9PcGVuIFhBIHRyYW5zYWN0aW9uIGlkZW50aWZpZXIgKi8KIHsKIAl0cnhfdCoJ
dHJ4OwogCiAJaWYgKHhpZCA9PSBOVUxMKSB7CiAKLQkJcmV0dXJuIChOVUxMKTsKKwkJcmV0dXJu
KE5VTEwpOwogCX0KIAogCXJ3X2xvY2tfc19sb2NrKCZ0cnhfc3lzLT5sb2NrKTsKQEAgLTE2NzIs
MTkgKzE2NzMsMjAgQEAgdHJ4X2dldF90cnhfYnlfeGlkKAogCQlvZiBndHJpZF9sZW5ndGgrYnF1
YWxfbGVuZ3RoIGJ5dGVzIHNob3VsZCBiZQogCQl0aGUgc2FtZSAqLwogCi0JCXV0X2FkKHRyeC0+
aW5fdHJ4X2xpc3QpOwotCi0JCWlmICh4aWQtPmd0cmlkX2xlbmd0aCA9PSB0cngtPnhpZC5ndHJp
ZF9sZW5ndGgKKwkJaWYgKHRyeF9zdGF0ZV9lcSh0cngsIFRSWF9TVEFURV9QUkVQQVJFRCkKKwkJ
ICAgICYmIHhpZC0+Z3RyaWRfbGVuZ3RoID09IHRyeC0+eGlkLmd0cmlkX2xlbmd0aAogCQkgICAg
JiYgeGlkLT5icXVhbF9sZW5ndGggPT0gdHJ4LT54aWQuYnF1YWxfbGVuZ3RoCiAJCSAgICAmJiBt
ZW1jbXAoeGlkLT5kYXRhLCB0cngtPnhpZC5kYXRhLAogCQkJICAgICAgeGlkLT5ndHJpZF9sZW5n
dGggKyB4aWQtPmJxdWFsX2xlbmd0aCkgPT0gMCkgeworCisJCQkvKiBJbnZhbGlkYXRlIHRoZSBY
SUQsIHNvIHRoYXQgc3Vic2VxdWVudCBjYWxscworCQkJd2lsbCBub3QgZmluZCBpdC4gKi8KKwkJ
CW1lbXNldCgmdHJ4LT54aWQsIDAsIHNpemVvZih0cngtPnhpZCkpOworCQkJdHJ4LT54aWQuZm9y
bWF0SUQgPSAtMTsKIAkJCWJyZWFrOwogCQl9Ci0JfQotCi0JaWYgKHRyeCAhPSBOVUxMICYmICF0
cnhfc3RhdGVfZXEodHJ4LCBUUlhfU1RBVEVfUFJFUEFSRUQpKSB7CiAKLQkJdHJ4ID0gTlVMTDsK
KwkJdHJ4ID0gVVRfTElTVF9HRVRfTkVYVCh0cnhfbGlzdCwgdHJ4KTsKIAl9CiAKIAlyd19sb2Nr
X3NfdW5sb2NrKCZ0cnhfc3lzLT5sb2NrKTsKCg==

--===============0686004015==
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: b4fb89ee4a87ec6de4166f5d122dc52874dc8f5e
# timestamp: 2011-01-27 13:46:21 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: jimmy.yang@stripped\
#   bqzl0nzm9snx95n1
# 
# Begin bundle
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
Go8A


--===============0686004015==--