From: marko.makela
Date: May 4 2010 1:15pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3440 to 3443) Bug#53306
List-Archive: http://lists.mysql.com/commits/107324
X-Bug: 53306
Message-Id: <201005041315.o44CF83N010335@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1294861894=="

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

IDM0NDMgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBEb2N1bWVudCBCdWcgIzUzMzA2
IGluIHRoZSBJbm5vREIgUGx1Z2luIENoYW5nZUxvZy4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogMzQ0MiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1
LTA0CiAgICAgIGZzcF9pbml0X2ZpbGVfcGFnZV9sb3coKTogWmVybyBvdXQgdGhlIHBhZ2UuIChC
dWcgIzUzMzA2KQoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2Rpc2FibGVkLmRlZgogICAgICBzdG9yYWdlL2lubm9iYXNlL2ZzcC9mc3AwZnNwLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQogMzQ0MSBNYXJrbyBNw6RrZWzDpAkyMDEw
LTA1LTA0CiAgICAgIGZzcF9pbml0X2ZpbGVfcGFnZV9sb3coKTogWmVybyBvdXQgdGhlIHBhZ2Uu
IChCdWcgIzUzMzA2KQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4v
ZnNwL2ZzcDBmc3AuYwogMzQ0MCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTA0CiAgICAgIEFkZCBW
YWxncmluZCBjaGVja3MgdG8gY2F0Y2ggdW5pbml0aWFsaXplZCB3cml0ZXMgdG8gZGF0YSBmaWxl
cy4KICAgICAgYnVmX2ZsdXNoX2luc2VydF9pbnRvX2ZsdXNoX2xpc3QoKSwKICAgICAgYnVmX2Zs
dXNoX2luc2VydF9zb3J0ZWRfaW50b19mbHVzaF9saXN0KCksCiAgICAgIGJ1Zl9mbHVzaF9wb3N0
X3RvX2RvdWJsZXdyaXRlX2J1ZigpOiBDaGVjayB0aGF0IHRoZSBwYWdlIGlzIGluaXRpYWxpemVk
LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMKPT09
IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvZGlzYWJsZWQuZGVmJwot
LS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2Rpc2FibGVkLmRlZgkyMDEwLTA0LTMwIDEw
OjAyOjM2ICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvZGlzYWJsZWQuZGVm
CTIwMTAtMDUtMDQgMTM6MTM6NTggKzAwMDAKQEAgLTksNCArOSwzIEBACiAjICBEbyBub3QgdXNl
IGFueSBUQUIgY2hhcmFjdGVycyBmb3Igd2hpdGVzcGFjZS4KICMKICMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIwotaW5ub2RiIDogQnVnIzUzMzA2IDIwMTAtMDQtMzAgVmFzaWxEaW1vdiB2YWxncmluZCB3
YXJuaW5ncwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvZnNwL2ZzcDBmc3Au
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9mc3AvZnNwMGZzcC5jCTIwMDctMDYtMjYgMTM6MDg6
MTEgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9mc3AvZnNwMGZzcC5jCTIwMTAtMDUtMDQg
MTM6MTM6NTggKzAwMDAKQEAgLTgwMiwxMiArODAyLDcgQEAgZnNwX2luaXRfZmlsZV9wYWdlX2xv
dygKIAogCWJ1Zl9ibG9ja19hbGlnbihwYWdlKS0+Y2hlY2tfaW5kZXhfcGFnZV9hdF9mbHVzaCA9
IEZBTFNFOwogCi0jaWZkZWYgVU5JVl9CQVNJQ19MT0dfREVCVUcKLQltZW1zZXQocGFnZSwgMHhm
ZiwgVU5JVl9QQUdFX1NJWkUpOwotI2VuZGlmCi0JbWFjaF93cml0ZV90b184KHBhZ2UgKyBVTklW
X1BBR0VfU0laRSAtIEZJTF9QQUdFX0VORF9MU05fT0xEX0NIS1NVTSwKLQkJCXV0X2R1bGludF96
ZXJvKTsKLQltYWNoX3dyaXRlX3RvXzgocGFnZSArIEZJTF9QQUdFX0xTTiwgdXRfZHVsaW50X3pl
cm8pOworCW1lbXNldChwYWdlLCAwLCBVTklWX1BBR0VfU0laRSk7CiB9CiAKIC8qKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCTIwMTAtMDQtMjggMDY6MzM6MjUgKzAwMDAK
KysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQkyMDEwLTA1LTA0IDEzOjEzOjU4
ICswMDAwCkBAIC0xMjYsMTEgKzEyNiw2IEBAIGJ5IG9uZS4gKi8KIAkJCS8qIHRoZSBhYm92ZSBv
cHRpb24gcHJldmVudHMgZm9yY2luZyBvZiBsb2cgdG8gZGlzawogCQkJYXQgYSBidWZmZXIgcGFn
ZSB3cml0ZTogaXQgc2hvdWxkIGJlIHRlc3RlZCB3aXRoIHRoaXMKIAkJCW9wdGlvbiBvZmY7IGFs
c28gc29tZSBpYnVmIHRlc3RzIGFyZSBzdXBwcmVzc2VkICovCi0vKgotI2RlZmluZSBVTklWX0JB
U0lDX0xPR19ERUJVRwotKi8KLQkJCS8qIHRoZSBhYm92ZSBvcHRpb24gZW5hYmxlcyBiYXNpYyBy
ZWNvdmVyeSBkZWJ1Z2dpbmc6Ci0JCQluZXcgYWxsb2NhdGVkIGZpbGUgcGFnZXMgYXJlIHJlc2V0
ICovCiAKICNpZiAoIWRlZmluZWQoVU5JVl9ERUJVRykgJiYgIWRlZmluZWQoSU5TSURFX0hBX0lO
Tk9CQVNFX0NDKSAmJiAhZGVmaW5lZChVTklWX01VU1RfTk9UX0lOTElORSkpCiAvKiBEZWZpbml0
aW9uIGZvciBpbmxpbmUgdmVyc2lvbiAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VM
b2cJMjAxMC0wNS0wNCAxMDo1NTo0NiArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
Q2hhbmdlTG9nCTIwMTAtMDUtMDQgMTM6MTU6MTcgKzAwMDAKQEAgLTEsMyArMSw4IEBACisyMDEw
LTA1LTA0CVRoZSBJbm5vREIgVGVhbQorCisJKiBmc3AvZnNwMGZzcC5jOgorCUZpeCBCdWcjNTMz
MDYgdmFsZ3JpbmQ6IHdhcm5pbmdzIGluIGlubm9kYi5pbm5vZGIKKwogMjAxMC0wNS0wMwlUaGUg
SW5ub0RCIFRlYW0KIAogCSogYnVmMGJ1Zi5jOgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9mc3AvZnNwMGZzcC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
ZnNwL2ZzcDBmc3AuYwkyMDEwLTAyLTIwIDE2OjQ1OjQxICswMDAwCisrKyBiL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9mc3AvZnNwMGZzcC5jCTIwMTAtMDUtMDQgMTM6MDk6MTcgKzAwMDAKQEAgLTg2
OSwxMiArODY5LDEwIEBAIGZzcF9pbml0X2ZpbGVfcGFnZV9sb3coCiAJCXJldHVybjsKIAl9CiAK
LQlVTklWX01FTV9JTlZBTElEKHBhZ2UsIFVOSVZfUEFHRV9TSVpFKTsKKwltZW1zZXQocGFnZSwg
MCwgVU5JVl9QQUdFX1NJWkUpOwogCW1hY2hfd3JpdGVfdG9fNChwYWdlICsgRklMX1BBR0VfT0ZG
U0VULCBidWZfYmxvY2tfZ2V0X3BhZ2Vfbm8oYmxvY2spKTsKLQltZW1zZXQocGFnZSArIEZJTF9Q
QUdFX0xTTiwgMCwgOCk7CiAJbWFjaF93cml0ZV90b180KHBhZ2UgKyBGSUxfUEFHRV9BUkNIX0xP
R19OT19PUl9TUEFDRV9JRCwKIAkJCWJ1Zl9ibG9ja19nZXRfc3BhY2UoYmxvY2spKTsKLQltZW1z
ZXQocGFnZSArIFVOSVZfUEFHRV9TSVpFIC0gRklMX1BBR0VfRU5EX0xTTl9PTERfQ0hLU1VNLCAw
LCA4KTsKIH0KIAogI2lmbmRlZiBVTklWX0hPVEJBQ0tVUAoK

--===============1294861894==
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/mysql/5.1-innodb/
# testament_sha1: e75253d10d534c2fc8ad3d69df9e0e5eeef2d461
# timestamp: 2010-05-04 16:15:42 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   gemcfhj7mefrhalo
# 
# Begin bundle
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


--===============1294861894==--