From: marko.makela
Date: January 27 2011 11:47am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3293 to 3295)
List-Archive: http://lists.mysql.com/commits/129771
Message-Id: <201101271148.p0RBEw5o003113@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0028867124=="

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

IDMyOTUgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB0cnguaAogICAgICBzdG9yYWdlL2lubm9iYXNlL3Ry
eC90cngwdHJ4LmMKIDMyOTQgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNwogICAgICBpYnVmX2Nv
bnRyYWN0X2V4dCgpOiBSZW1vdmUgYW4gI2lmIDAgc2VjdGlvbiBvZiBjb2RlCiAgICAgIHRoYXQg
cmVmZXJzIHRvIHRyeF9zeXNfc2V0X2lidWZfZm9ybWF0KCkuCiAgICAgIENoYW5nZSBidWZmZXIg
Zm9ybWF0IHRhZ2dpbmcgd2FzIG5ldmVyIGltcGxlbWVudGVkLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMKIDMyOTMgTWFya28gTcOka2Vsw6QJ
MjAxMS0wMS0yNiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuMS1pbm5vZGIgdG8gbXlzcWwt
NS41LWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MHVwZC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVm
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNjA4MDI1Mi12bHAxNzNoajk4eDFvcmVrCisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDEyNzExMzA1OS1nNXMzdTdwZGNlNXBzNmcxCkBAIC0yNTg1LDIzICsyNTg1LDYg
QEAgaWJ1Zl9jb250cmFjdF9leHQoCiAKIAlpZiAoVU5JVl9VTkxJS0VMWShpYnVmLT5lbXB0eSkK
IAkgICAgJiYgVU5JVl9MSUtFTFkoIXNydl9zaHV0ZG93bl9zdGF0ZSkpIHsKLWlidWZfaXNfZW1w
dHk6Ci0KLSNpZiAwIC8qIFRPRE8gKi8KLQkJaWYgKHNydl9zaHV0ZG93bl9zdGF0ZSkgewotCQkJ
LyogSWYgdGhlIGluc2VydCBidWZmZXIgYmVjb21lcyBlbXB0eSBkdXJpbmcKLQkJCXNodXRkb3du
LCBub3RlIGl0IGluIHRoZSBzeXN0ZW0gdGFibGVzcGFjZS4gKi8KLQotCQkJdHJ4X3N5c19zZXRf
aWJ1Zl9mb3JtYXQoVFJYX1NZU19JQlVGX0VNUFRZKTsKLQkJfQotCi0JCS8qIFRPIERPOiBjYWxs
IHRyeF9zeXNfc2V0X2lidWZfZm9ybWF0KCkgYXQgc3RhcnR1cAotCQlhbmQgd2hlbmV2ZXIgaWJ1
Zl91c2UgaXMgY2hhbmdlZCB0byBhbGxvdyBidWZmZXJlZAotCQlkZWxldGUtbWFya2luZyBvciBk
ZWxldGluZy4gIE5ldmVyIGRvd25ncmFkZSB0aGUKLQkJc3RhbXBlZCBmb3JtYXQgZXhjZXB0IHdo
ZW4gdGhlIGluc2VydCBidWZmZXIgYmVjb21lcwotCQllbXB0eS4gKi8KLSNlbmRpZgotCiAJCXJl
dHVybigwKTsKIAl9CiAKQEAgLTI2MzEsNyArMjYxNCw3IEBAIGlidWZfaXNfZW1wdHk6CiAJCW10
cl9jb21taXQoJm10cik7CiAJCWJ0cl9wY3VyX2Nsb3NlKCZwY3VyKTsKIAotCQlnb3RvIGlidWZf
aXNfZW1wdHk7CisJCXJldHVybigwKTsKIAl9CiAKIAlzdW1fc2l6ZXMgPSBpYnVmX2dldF9tZXJn
ZV9wYWdlX25vcyhUUlVFLCBidHJfcGN1cl9nZXRfcmVjKCZwY3VyKSwKCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHRyeC5oJwotLS0gYS9zdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvdHJ4MHRyeC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTEwMTI2MDgwMjUyLXZscDE3M2hqOTh4MW9yZWsKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3RyeDB0cnguaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNzExMzA1
OS1nNXMzdTdwZGNlNXBzNmcxCkBAIC0yMTQsMTIgKzIxNCwxMiBAQCB0cnhfcmVjb3Zlcl9mb3Jf
bXlzcWwoCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKi8vKioKIFRoaXMgZnVuY3Rpb24gaXMgdXNlZCB0byBmaW5kIG9u
ZSBYL09wZW4gWEEgZGlzdHJpYnV0ZWQgdHJhbnNhY3Rpb24KIHdoaWNoIGlzIGluIHRoZSBwcmVw
YXJlZCBzdGF0ZQotQHJldHVybgl0cnggb3IgTlVMTCAqLworQHJldHVybgl0cnggb3IgTlVMTDsg
b24gbWF0Y2gsIHRoZSB0cngtPnhpZCB3aWxsIGJlIGludmFsaWRhdGVkICovCiBVTklWX0lOVEVS
TgogdHJ4X3QgKgogdHJ4X2dldF90cnhfYnlfeGlkKAogLyo9PT09PT09PT09PT09PT0qLwotCVhJ
RCoJeGlkKTsJLyohPCBpbjogWC9PcGVuIFhBIHRyYW5zYWN0aW9uIGlkZW50aWZpY2F0aW9uICov
CisJY29uc3QgWElEKgl4aWQpOwkvKiE8IGluOiBYL09wZW4gWEEgdHJhbnNhY3Rpb24gaWRlbnRp
ZmllciAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBJZiByZXF1aXJlZCwgZmx1c2hlcyB0aGUgbG9n
IHRvIGRpc2sgaWYgd2UgY2FsbGVkIHRyeF9jb21taXRfZm9yX215c3FsKCkKIHdpdGggdHJ4LT5m
bHVzaF9sb2dfbGF0ZXIgPT0gVFJVRS4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL3RyeC90cngwdHJ4LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNjA4MDI1Mi12bHAxNzNoajk4eDFv
cmVrCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDEyNzExMzA1OS1nNXMzdTdwZGNlNXBzNmcxCkBAIC0yMDA0LDE4
ICsyMDA0LDE4IEBAIHRyeF9yZWNvdmVyX2Zvcl9teXNxbCgKIC8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogVGhp
cyBmdW5jdGlvbiBpcyB1c2VkIHRvIGZpbmQgb25lIFgvT3BlbiBYQSBkaXN0cmlidXRlZCB0cmFu
c2FjdGlvbgogd2hpY2ggaXMgaW4gdGhlIHByZXBhcmVkIHN0YXRlCi1AcmV0dXJuCXRyeCBvciBO
VUxMICovCitAcmV0dXJuCXRyeCBvciBOVUxMOyBvbiBtYXRjaCwgdGhlIHRyeC0+eGlkIHdpbGwg
YmUgaW52YWxpZGF0ZWQgKi8KIFVOSVZfSU5URVJOCiB0cnhfdCoKIHRyeF9nZXRfdHJ4X2J5X3hp
ZCgKIC8qPT09PT09PT09PT09PT09Ki8KLQlYSUQqCXhpZCkJLyohPCBpbjogWC9PcGVuIFhBIHRy
YW5zYWN0aW9uIGlkZW50aWZpY2F0aW9uICovCisJY29uc3QgWElEKgl4aWQpCS8qITwgaW46IFgv
T3BlbiBYQSB0cmFuc2FjdGlvbiBpZGVudGlmaWVyICovCiB7CiAJdHJ4X3QqCXRyeDsKIAogCWlm
ICh4aWQgPT0gTlVMTCkgewogCi0JCXJldHVybiAoTlVMTCk7CisJCXJldHVybihOVUxMKTsKIAl9
CiAKIAltdXRleF9lbnRlcigma2VybmVsX211dGV4KTsKQEAgLTIwMjgsMTAgKzIwMjgsMTYgQEAg
dHJ4X2dldF90cnhfYnlfeGlkKAogCQlvZiBndHJpZF9sZW5ndGgrYnF1YWxfbGVuZ3RoIGJ5dGVz
IHNob3VsZCBiZQogCQl0aGUgc2FtZSAqLwogCi0JCWlmICh4aWQtPmd0cmlkX2xlbmd0aCA9PSB0
cngtPnhpZC5ndHJpZF9sZW5ndGgKKwkJaWYgKHRyeC0+Y29uY19zdGF0ZSA9PSBUUlhfUFJFUEFS
RUQKKwkJICAgICYmIHhpZC0+Z3RyaWRfbGVuZ3RoID09IHRyeC0+eGlkLmd0cmlkX2xlbmd0aAog
CQkgICAgJiYgeGlkLT5icXVhbF9sZW5ndGggPT0gdHJ4LT54aWQuYnF1YWxfbGVuZ3RoCiAJCSAg
ICAmJiBtZW1jbXAoeGlkLT5kYXRhLCB0cngtPnhpZC5kYXRhLAogCQkJICAgICAgeGlkLT5ndHJp
ZF9sZW5ndGggKyB4aWQtPmJxdWFsX2xlbmd0aCkgPT0gMCkgeworCisJCQkvKiBJbnZhbGlkYXRl
IHRoZSBYSUQsIHNvIHRoYXQgc3Vic2VxdWVudCBjYWxscworCQkJd2lsbCBub3QgZmluZCBpdC4g
Ki8KKwkJCW1lbXNldCgmdHJ4LT54aWQsIDAsIHNpemVvZih0cngtPnhpZCkpOworCQkJdHJ4LT54
aWQuZm9ybWF0SUQgPSAtMTsKIAkJCWJyZWFrOwogCQl9CiAKQEAgLTIwNDAsMTQgKzIwNDYsNSBA
QCB0cnhfZ2V0X3RyeF9ieV94aWQoCiAKIAltdXRleF9leGl0KCZrZXJuZWxfbXV0ZXgpOwogCi0J
aWYgKHRyeCkgewotCQlpZiAodHJ4LT5jb25jX3N0YXRlICE9IFRSWF9QUkVQQVJFRCkgewotCi0J
CQlyZXR1cm4oTlVMTCk7Ci0JCX0KLQotCQlyZXR1cm4odHJ4KTsKLQl9IGVsc2UgewotCQlyZXR1
cm4oTlVMTCk7Ci0JfQorCXJldHVybih0cngpOwogfQoK

--===============0028867124==
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.5-innodb/
# testament_sha1: cce538907ee4d5d6fb74bb8d1968c2f3b7dfb15b
# timestamp: 2011-01-27 13:48:11 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   vlp173hj98x1orek
# 
# Begin bundle
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


--===============0028867124==--