From: marko.makela
Date: May 4 2010 10:56am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3437 to 3438)
List-Archive: http://lists.mysql.com/commits/107297
Message-Id: <201005041056.o44AuSrd030317@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1985609856=="

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

IDM0MzggTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBSZW1vdmUgVU5JVl9CVFJfQVZP
SURfQ09QWS4gSXQgd2FzIGJyb2tlbiBiZWNhdXNlIGJ0cl9hdHRhY2hfaGFsZl9wYWdlcygpCiAg
ICAgIHdvdWxkIGdldCB0aGUgYmxvY2ssIG5ld19ibG9jayBpbiB0aGUgd3Jvbmcgb3JkZXIuCiAg
ICAgIEZpeGluZyB0aGF0IHdvdWxkIGhhdmUgY29tcGxpY2F0ZWQgdGhlIGZ1bmN0aW9uIGV2ZW4g
ZnVydGhlcgogICAgICBmb3IgdGhpcyBtYXJnaW5hbCBjYXNlLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9idHIvYnRyMGJ0ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3Vu
aXYuaQogMzQzNyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTA0CiAgICAgIGJ0cl9wYWdlX3NwbGl0
X2FuZF9pbnNlcnQoKTogQ29ycmVjdCB0aGUgZml4IG9mIEJ1ZyAjNTI5NjQuCiAgICAgIFdoZW4g
c3BsaXRfcmVjPT1OVUxMLCBjaG9vc2UgdGhlIGNvcnJlY3Qgbm9kZSBwb2ludGVyIGtleSAoZmly
c3RfcmVjKS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9i
dHIwYnRyLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VM
b2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMC0wNS0wMyAxMjoy
ODo1OSArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCTIwMTAtMDUt
MDQgMTA6NTU6NDYgKzAwMDAKQEAgLTQ4LDEyICs0OCw2IEBACiAJT25seSBjaGVjayB0aGUgcmVj
b3JkIHNpemUgYXQgaW5kZXggY3JlYXRpb24gdGltZSB3aGVuCiAJaW5ub2RiX3N0cmljdF9tb2Rl
IGlzIHNldCBvciB3aGVuIFJPV19GT1JNQVQgaXMgRFlOQU1JQyBvciBDT01QUkVTU0VELgogCi0y
MDEwLTA0LTIwCVRoZSBJbm5vREIgVGVhbQotCi0JKiBidHIvYnRyMGJ0ci5jLCBpbmNsdWRlL3Vu
aXYuaToKLQlJbXBsZW1lbnQgVU5JVl9CVFJfQVZPSURfQ09QWSwgZm9yIGF2b2lkaW5nIHdyaXRl
cyB3aGVuIGEgQi10cmVlCi0Jbm9kZSBpcyBzcGxpdCBhdCB0aGUgZmlyc3Qgb3IgbGFzdCByZWNv
cmQuCi0KIDIwMTAtMDQtMTUJVGhlIElubm9EQiBUZWFtCiAKIAkqIHRyeC90cngwcmVjLmM6Cgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jCTIwMTAtMDUtMDQgMDk6MzE6
MjggKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMJMjAxMC0w
NS0wNCAxMDo1NTo0NiArMDAwMApAQCAtMjA0NiwxNyArMjA0Niw3IEBAIGluc2VydF9lbXB0eToK
IAl9CiAKIAkvKiA1LiBNb3ZlIHRoZW4gdGhlIHJlY29yZHMgdG8gdGhlIG5ldyBwYWdlICovCi0J
aWYgKGRpcmVjdGlvbiA9PSBGU1BfRE9XTgotI2lmZGVmIFVOSVZfQlRSX0FWT0lEX0NPUFkKLQkg
ICAgJiYgcGFnZV9yZWNfaXNfc3VwcmVtdW0obW92ZV9saW1pdCkpIHsKLQkJLyogSW5zdGVhZCBv
ZiBtb3ZpbmcgYWxsIHJlY29yZHMsIG1ha2UgdGhlIG5ldyBwYWdlCi0JCXRoZSBlbXB0eSBwYWdl
LiAqLwotCi0JCWxlZnRfYmxvY2sgPSBibG9jazsKLQkJcmlnaHRfYmxvY2sgPSBuZXdfYmxvY2s7
Ci0JfSBlbHNlIGlmIChkaXJlY3Rpb24gPT0gRlNQX0RPV04KLSNlbmRpZiAvKiBVTklWX0JUUl9B
Vk9JRF9DT1BZICovCi0JCSAgICkgeworCWlmIChkaXJlY3Rpb24gPT0gRlNQX0RPV04pIHsKIAkJ
LyoJCWZwdXRzKCJTcGxpdCBsZWZ0XG4iLCBzdGRlcnIpOyAqLwogCiAJCWlmICgwCkBAIC0yMDk5
LDE0ICsyMDg5LDYgQEAgaW5zZXJ0X2VtcHR5OgogCQlyaWdodF9ibG9jayA9IGJsb2NrOwogCiAJ
CWxvY2tfdXBkYXRlX3NwbGl0X2xlZnQocmlnaHRfYmxvY2ssIGxlZnRfYmxvY2spOwotI2lmZGVm
IFVOSVZfQlRSX0FWT0lEX0NPUFkKLQl9IGVsc2UgaWYgKCFzcGxpdF9yZWMpIHsKLQkJLyogSW5z
dGVhZCBvZiBtb3ZpbmcgYWxsIHJlY29yZHMsIG1ha2UgdGhlIG5ldyBwYWdlCi0JCXRoZSBlbXB0
eSBwYWdlLiAqLwotCi0JCWxlZnRfYmxvY2sgPSBuZXdfYmxvY2s7Ci0JCXJpZ2h0X2Jsb2NrID0g
YmxvY2s7Ci0jZW5kaWYgLyogVU5JVl9CVFJfQVZPSURfQ09QWSAqLwogCX0gZWxzZSB7CiAJCS8q
CQlmcHV0cygiU3BsaXQgcmlnaHRcbiIsIHN0ZGVycik7ICovCiAKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYuaQkyMDEwLTA0LTI2IDA4OjM1OjU3ICswMDAwCisrKyBi
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYuaQkyMDEwLTA1LTA0IDEwOjU1OjQ2
ICswMDAwCkBAIC0yMDUsMTAgKzIwNSw2IEBAIG9wZXJhdGlvbnMgKHZlcnkgc2xvdyk7IGFsc28g
VU5JVl9ERUJVRwogCQkJCQkJYWRhcHRpdmUgaGFzaCBpbmRleCAqLwogI2RlZmluZSBVTklWX1NS
Vl9QUklOVF9MQVRDSF9XQUlUUwkJLyogZW5hYmxlIGRpYWdub3N0aWMgb3V0cHV0CiAJCQkJCQlp
biBzeW5jMHN5bmMuYyAqLwotI2RlZmluZSBVTklWX0JUUl9BVk9JRF9DT1BZCQkJLyogd2hlbiBz
cGxpdHRpbmcgQi10cmVlIG5vZGVzLAotCQkJCQkJZG8gbm90IG1vdmUgYW55IHJlY29yZHMgd2hl
bgotCQkJCQkJYWxsIHRoZSByZWNvcmRzIHdvdWxkCi0JCQkJCQliZSBtb3ZlZCAqLwogI2RlZmlu
ZSBVTklWX0JUUl9QUklOVAkJCQkvKiBlbmFibGUgZnVuY3Rpb25zIGZvcgogCQkJCQkJcHJpbnRp
bmcgQi10cmVlcyAqLwogI2RlZmluZSBVTklWX1pJUF9ERUJVRwkJCQkvKiBleHRlbnNpdmUgY29u
c2lzdGVuY3kgY2hlY2tzCgo=

--===============1985609856==
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: a580f765deedf63094e011159814c68af3a7780c
# timestamp: 2010-05-04 13:56:16 +0300
# base_revision_id: marko.makela@stripped\
#   44v6glupe1dsh0ug
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS0eLfEAAvnfgEAwW2f//38n
36C/7//4UAW7p7oABdYG2ta1bu0JJNQhk1TyejTKempN5T0JHonqAAZAaZPU0OMmTJiMTACZMEyA
GjCMAQwDIiZU80pkNPaKeKNAZAGIAZBk0AEiiJMAT9U0aZGajR6jQAAAADIBVJMQmTJoTCmTJR+J
MZTUyP1PU9CjCaPUGi4y7RejG3+Q+2XzUeD5DMAhgkIJRO2pxFbrrCBYG6J1jjnxxsWdjxu4Akra
bbY2HtqI+pqg7ruMjCBGWnNNcRzVciJLxUU+jU0pnYqIf3ReDG5y1r0cgw39xgNSABkZZnSBohXs
0pLXG1lliIs82o99BQVKtRJVkWAnANKcYJRg5vV+P191JOzw+WrrG3p/9gF59R3Id4viAqr5o+96
e7yWTVRpkBVxVqQVBhukXuRLNIkzCaTslul46IO5ScCwW3Jy4rliIlNtWREVvQvFaJOGpVdbZWpN
In/tvjF3+Q38jSI56rNc7fHScoGSHwW+Et/yx+N4lVdYcdVbHPq4GBhg0Y+g0rxtssvLBoxM2x78
fT27dty7gg2xFZMCWvzdbXr7npPkyXuU57lyuNthwjnBYjVhJKXoiKl7JuLtbGWGXSbl3sTVhNbT
BzE1F64XQ1trJ0K423q0vRmSQsvZ0wVsjpm4mkQ0VtZlJKirdw99EP+bzttS4b6+e1nAxtu90s2x
C2kkMOKZq123pLhtS5UUN7k12sRRrcXDvo54cIhRTqxVyb2xpcpFmglflDFMWv37DVq27k8trbTc
MPlwhg/hasmkK7yNae2HQ0Qohm1uj26W49C65LooWDZP1izYxWcbs2lNNVWbRpYqya3JfPVpmJzw
rYamIymznc0ZLULYvlRx0uJGMK5GCLbkTs65S7PRtkOyTy2NjZzkQ2Qc2vAi6kyg2u7aHV63kgYn
g9ZSK3Bklxnk2MbHDzfoV4es9YuMCDD36pq6dXPmz/HzWzZ6NHLZ76Mf94z5Xu9X004Mzc6aDC4P
dHfIKMcDYBacDgC9DF5h+mHhpAr4PtaKIr+gbtPysMLYoeFyF395Bx/D4zukn9sp9tiHNXydLf4/
Sgo83m93qevZPfhgn741RJSfn/OISYNo8mTUydVXaKyewY9mG4fRwHeufvr9mr5zT+dJWQJxPfAy
ZU3/Ym4dTgq0WLoVhLY0a0Ks9g6G2N7u35irqOj9vYY9vb9lnOJuMUmQ/zgXtzmotsucE+tc2t3w
Q9XwVIWS/iZvOKkDFiL1kwEbVytkjsnigOR4Zk00mmqKMmqwIzPeNSmjwmEaxFcqWLHXOBZcaxjW
QWO+rPi6XW68WCjpHrTMlzM/aPbHE6eE5x75G7CM3QGWA6ZJo7ag7ryzZYDDAb/knulZZ2cuEQ2h
F0RvXkMmu0OWrbETmfIGCWIROTSKeFZRZ/Hy9d0WOXKzIJzLqtEV6VmxLVyqITZjwuAL6xWIT93V
7dcJh2KRjAlEW+MqXO7ZdHWeFmcD+IFnJ0cGX4IIZaFkzA/PQXiLJ3pxTBFv0yPIw0IIHcDiqqK1
GKeeEHMGGdBHWprCi0moUFLQwBl6euS0x1eKa1IJgW1xZfBAdItDrodafaWEpshVpaooxolUDAFg
IWo6GgOv1culfxWJKLE04JIoT6d++5DLx6I2SidMbbIGqMceFdxuvXSXIsi/KhQibAdI+/F/VzgM
AnAfAEKYEYKZS8l6+Srtcu80WnCKbRCJ6xSMFzaoEC8xiyLlENmExIyJdDmmZdJ5IZO18XK9FxnX
HGKeHgYbJW8tI3X30Q5SQ+sqcGJ94iJKiitmazbrhzUShB6yWqf/i7kinChIFo8W+IA=


--===============1985609856==--