From: marko.makela
Date: May 4 2010 12:55pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3440)
List-Archive: http://lists.mysql.com/commits/107311
Message-Id: <201005041255.o44CtPJQ028451@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0097121340=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQxMjQ3NDQtYzFpdmY1
dG05MG52N2xjMQoKIDM0NDAgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBBZGQgVmFs
Z3JpbmQgY2hlY2tzIHRvIGNhdGNoIHVuaW5pdGlhbGl6ZWQgd3JpdGVzIHRvIGRhdGEgZmlsZXMu
CiAgICAgIGJ1Zl9mbHVzaF9pbnNlcnRfaW50b19mbHVzaF9saXN0KCksCiAgICAgIGJ1Zl9mbHVz
aF9pbnNlcnRfc29ydGVkX2ludG9fZmx1c2hfbGlzdCgpLAogICAgICBidWZfZmx1c2hfcG9zdF90
b19kb3VibGV3cml0ZV9idWYoKTogQ2hlY2sgdGhhdCB0aGUgcGFnZSBpcyBpbml0aWFsaXplZC4K
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGZsdS5jCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwkyMDA3LTAxLTE4IDIxOjI3OjMxICswMDAwCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwkyMDEwLTA1LTA0IDEyOjU1OjEwICswMDAw
CkBAIC01NSw2ICs1NSw3IEBAIGJ1Zl9mbHVzaF9pbnNlcnRfaW50b19mbHVzaF9saXN0KAogCSAg
ICAgIHx8ICh1dF9kdWxpbnRfY21wKChVVF9MSVNUX0dFVF9GSVJTVChidWZfcG9vbC0+Zmx1c2hf
bGlzdCkpCiAJCQkJLT5vbGRlc3RfbW9kaWZpY2F0aW9uLAogCQkJCWJsb2NrLT5vbGRlc3RfbW9k
aWZpY2F0aW9uKSA8PSAwKSk7CisJVU5JVl9NRU1fQVNTRVJUX1JXKGJsb2NrLT5mcmFtZSwgVU5J
Vl9QQUdFX1NJWkUpOwogCiAJVVRfTElTVF9BRERfRklSU1QoZmx1c2hfbGlzdCwgYnVmX3Bvb2wt
PmZsdXNoX2xpc3QsIGJsb2NrKTsKIApAQCAtNzUsNiArNzYsNyBAQCBidWZfZmx1c2hfaW5zZXJ0
X3NvcnRlZF9pbnRvX2ZsdXNoX2xpc3QoCiAJYnVmX2Jsb2NrX3QqCWI7CiAKIAl1dF9hZChtdXRl
eF9vd24oJihidWZfcG9vbC0+bXV0ZXgpKSk7CisJVU5JVl9NRU1fQVNTRVJUX1JXKGJsb2NrLT5m
cmFtZSwgVU5JVl9QQUdFX1NJWkUpOwogCiAJcHJldl9iID0gTlVMTDsKIAliID0gVVRfTElTVF9H
RVRfRklSU1QoYnVmX3Bvb2wtPmZsdXNoX2xpc3QpOwpAQCAtNDIzLDYgKzQyNSw3IEBAIHRyeV9h
Z2FpbjoKIAkJZ290byB0cnlfYWdhaW47CiAJfQogCisJVU5JVl9NRU1fQVNTRVJUX1JXKGJsb2Nr
LT5mcmFtZSwgVU5JVl9QQUdFX1NJWkUpOwogCXV0X21lbWNweSh0cnhfZG91Ymxld3JpdGUtPndy
aXRlX2J1ZgogCQkgICsgVU5JVl9QQUdFX1NJWkUgKiB0cnhfZG91Ymxld3JpdGUtPmZpcnN0X2Zy
ZWUsCiAJCSAgYmxvY2stPmZyYW1lLCBVTklWX1BBR0VfU0laRSk7Cgo=

--===============0097121340==
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: aa21a48f73e10da0c5fe0ca46a26fde066b4160a
# timestamp: 2010-05-04 15:55:22 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   c1ivf5tm90nv7lc1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWacnf+oAAcFfgEAwW2f//3uj
X5C////wUAQ+7MAXrUKAOEkiTQ0TT0TaBkNQekbUGgyAYgNAcwJiaDCZMmTIwmCaaZGJgCGAiaFP
1Q02po0eoNGIAAADQNA9QBHqlPUGgAGgNAABoyAABpoBJITE0IyNNNNTVPNJhNT9RqMn6po0NNAP
SGp61rZhx0Gb59GNIKQym1eyt+7EiIhPSZDhw013Yl8oQETR8TB5SSpsCVCDkgiSCYVum3nFR4vs
UdAJLDkR2Ica2CrdcVTbXjuYMt7CWdj7lZpedA58bwOUcqx76vjmkKmxPn6FpWclUgcQRWEFsN9V
FIFp0AsGKeaDC032tYjRI3E+UPeifj4+UwNL4skPc9qoCGQNzzSh7gwQdxEgge7cNzxKG9a1qApd
dQLBOjagd3njbh5HPUFiCNlOOSJn3jjcF/PKA6JebT+2WV2vYZXCKlE1e81CJsKWDn8CZvxqBujd
EaBMrkxSsrCoMyWqQQTVDITSJOwCtTMwYqCgy2UKHpmUeem+eB0qQZSFxawPsmkxtUDWF9TiJPYS
d1qAsT6UJZBNVBXBqfCtPI1WjrFoG03m9fQV+NuGu/VVgRLiI0XDzMld7FHAHuM9+VDrC4MSMfP2
14F8rdgxeqqi4IuqCtP82bw/A5MLsYy72zJF54wIKWUlBT0vhcQvc/ErqziNq3K3DbYZm7M25P1L
5XsrInU8oQRiQRib7QWLFEIURB47jA8gpZAJI+g+olc9NIw075U2sfleD1BjdkhRSPDwEf0RmGM1
Ai33HrIlVxEOgjH5K4UFgXuf66xb60iDGOro7uBtINoIgY2bVZzfioYdSuthMVzGtC3i9aCYgCU8
feYTPRfHMXG36rKa7oeCc8Q/ARVfOKNjky+A6QoRiV/IPN5tLeBwlv/3linpHhqDyGHcvUbfKZQl
5GhYQC3sGKVjEWC4+PrtF+aRQT/1TI30p7FkDtfErsUawKoqGzvDJlxDQ2HlgnhtIqI43l5uF/Pb
OoVkRfmgXirgqKI0mFDf+uA1xkqGYJROlLH6+8LFFSiW5Yigdhumh5unyClIbaB58I1YANtA3FhQ
7OxSqXqFiopk300EawokVdVaYR2rOAhg75zGXawnrr1cAJ+IjRcxF/nyPmOTbVsFqRsFDq2md0aG
yqHBktD2yqRBnde94wNpk4vYZMyPBOT8zlmOThDOTKW7gkSA7Xo8xEgrXXzemw74Z7lppor6iYV8
spzG6YcM1WJYLjSoVfffYyfIVcvZ+5WkWLdVeEiDDMQByz6oKAzZGWRDch5QmA0k3bEgUdEVpQfq
4wLer/hpQZn0hc7Emxa8qHnNMa7CwGDUDEWUnFar48BGVkQpJHKgqJ/dtAKBiGhM06IisFzACFBO
fxdyRThQkKcnf+o=


--===============0097121340==--