From: marko.makela
Date: May 25 2010 12:37pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3481)
List-Archive: http://lists.mysql.com/commits/109164
Message-Id: <201005251238.o4PCNYZi008896@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1133744651=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNDExNDM0OS01a2F3
NTJzejB5aDRzemtiCgogMzQ4MSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTI1CiAgICAgIFN1cHBy
ZXNzIGJvZ3VzIFZhbGdyaW5kIHdhcm5pbmdzIGFib3V0IGJ1Zl9idWRkeV9yZWxvY2F0ZSgpCiAg
ICAgIGFjY2Vzc2luZyB1bmluaXRpYWxpemVkIG1lbW9yeSBpbiBWYWxncmluZC1pbnN0cnVtZW50
ZWQgYnVpbGRzLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3ZhbGdyaW5kLnN1cHAK
ICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVkZHkuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnbXlzcWwtdGVzdC92YWxncmluZC5zdXBwJwotLS0gYS9teXNxbC10ZXN0L3ZhbGdyaW5k
LnN1cHAJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjQxMTQzNDktNWthdzUy
c3oweWg0c3prYgorKysgYi9teXNxbC10ZXN0L3ZhbGdyaW5kLnN1cHAJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMDA1MjUxMjM3NDgtcG1wZWhiZzI5b3loYzFucwpAQCAtNzIyLDMg
KzcyMiw4IEBACiAgICBmdW46cHRocmVhZF9jcmVhdGUqCiB9CiAKK3sKKyAgIGJ1Zl9idWRkeV9y
ZWxvY2F0ZSBwZWVraW5nIChzcGFjZSxwYWdlKSBpbiBwb3RlbnRpYWxseSBmcmVlIGJsb2Nrcwor
ICAgTWVtY2hlY2s6QWRkcjEKKyAgIGZ1bjpidWZfYnVkZHlfcmVsb2NhdGUKK30KCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBidWRkeS5jJwotLS0gYS9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBidWRkeS5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNTI0MTE0MzQ5LTVrYXc1MnN6MHloNHN6a2IKKysrIGIvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVkZHkuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEwMDUyNTEyMzc0OC1wbXBlaGJnMjlveWhjMW5zCkBAIC00NDIsMTEgKzQ0MiwxNSBAQCBi
dWZfYnVkZHlfcmVsb2NhdGUoCiAJCXBvb2wpLCBzbyB0aGVyZSBpcyBub3RoaW5nIHdyb25nIGFi
b3V0IHRoaXMuICBUaGUKIAkJbWFjaF9yZWFkX2Zyb21fNCgpIGNhbGxzIGhlcmUgd2lsbCBvbmx5
IHRyaWdnZXIgYm9ndXMKIAkJVmFsZ3JpbmQgbWVtY2hlY2sgd2FybmluZ3MgaW4gVU5JVl9ERUJV
R19WQUxHUklORCBidWlsZHMuICovCi0JCWJwYWdlID0gYnVmX3BhZ2VfaGFzaF9nZXQoCi0JCQlt
YWNoX3JlYWRfZnJvbV80KChjb25zdCBieXRlKikgc3JjCi0JCQkJCSArIEZJTF9QQUdFX0FSQ0hf
TE9HX05PX09SX1NQQUNFX0lEKSwKLQkJCW1hY2hfcmVhZF9mcm9tXzQoKGNvbnN0IGJ5dGUqKSBz
cmMKLQkJCQkJICsgRklMX1BBR0VfT0ZGU0VUKSk7CisJCXVsaW50CQlzcGFjZQk9IG1hY2hfcmVh
ZF9mcm9tXzQoCisJCQkoY29uc3QgYnl0ZSopIHNyYyArIEZJTF9QQUdFX0FSQ0hfTE9HX05PX09S
X1NQQUNFX0lEKTsKKwkJdWxpbnQJCXBhZ2Vfbm8JPSBtYWNoX3JlYWRfZnJvbV80KAorCQkJKGNv
bnN0IGJ5dGUqKSBzcmMgKyBGSUxfUEFHRV9PRkZTRVQpOworCQkvKiBTdXBwcmVzcyBWYWxncmlu
ZCB3YXJuaW5ncyBhYm91dCBjb25kaXRpb25hbCBqdW1wCisJCW9uIHVuaW5pdGlhbGl6ZWQgdmFs
dWUuICovCisJCVVOSVZfTUVNX1ZBTElEKCZzcGFjZSwgc2l6ZW9mIHNwYWNlKTsKKwkJVU5JVl9N
RU1fVkFMSUQoJnBhZ2Vfbm8sIHNpemVvZiBwYWdlX25vKTsKKwkJYnBhZ2UgPSBidWZfcGFnZV9o
YXNoX2dldChzcGFjZSwgcGFnZV9ubyk7CiAKIAkJaWYgKCFicGFnZSB8fCBicGFnZS0+emlwLmRh
dGEgIT0gc3JjKSB7CiAJCQkvKiBUaGUgYmxvY2sgaGFzIHByb2JhYmx5IGJlZW4gZnJlc2hseQoK

--===============1133744651==
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.1-innodb/
# testament_sha1: 58b59dedb1d203e394127869c06cbd54891c38f1
# timestamp: 2010-05-25 15:38:05 +0300
# base_revision_id: marko.makela@stripped\
#   5kaw52sz0yh4szkb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdi0VjgAAk3flAAwU3///3/n
3wC////6BAAIAFAFg9RpBe7rTnQABwSSCU9BMQ0PRlMJiJ4o0DanqPUPU2k20RqaAlJMTRplPU8g
RI0/KT0gAANAAAHqA4yZNGIYmmAgYE0wRgmJppoAMIJJTTUyIep5TNT1PU00NADI8poekAAAAEkg
QNCBPQ0FNkmyHqppppoAaNGgaD1DDDI2jDlp2OAqFByN4tR60T4YsVeGrcUX3erwvc1x7OSMGDD1
wqj4vdamerqq/rFaOoYsjMwzU+Kvwla5ZcTyReos/+2cZZu47pYYkaNjLscom28SRd1UykOg89ud
5WucnkKh4bo0rjy33N0r5Y9hQ/OJ7AaqCggeBI9ppzHTM2TijdPB1FRs7yVM9jjVg3oVKyCyWFzz
8kJzc+QDdM3l3lvlJWRQsdCFNa9sOwoppIWRRYwzLM2cHAmtYFwTPe4aRfQJeEF2G8pe2EmiVkJI
ZLUpOo9i807vvVLJsvTUC9t2Xp8TfeZiLjnXNYXU1WqdDpAb9i9z6N6DbZ+A5BhNOeUFwFdCRhaZ
ZxW4iKSio24WvMQN9/rnM3pLXmtlQOtNt49BGNYTJSeBtp0lUTQVhkBqii76UpFxdaExoUc4J3XC
08yhVgMVJJlkIKLOLHQzu/RArKKHIN5YsK1IW5HKp3OUQHlcUnaL3JyJoarzSyPNdtFIFKoCgT+p
Fux1tAvZPc9DeMQxG64VAoxRrK9RUJjXmZgjMKOJI5ZOYjkhfl1njWjSF7UqH1AVwcm7bdKVpYQl
IGGBqXuuSwCLy/FLr04582/ArjTYYPCQscZrDJLNrsc7yGogqDLZVIvIjjYOJsUoHQXVp0sc5wLc
zUmdErk+AGts9ZiIo2uZEWK6YziooGzoGmHJ1OIqmJdRCn3r+Hsv8tcZhmbZ4elKjvOG6luE5v5k
qxCT0LUhwJBcRRInccRhaqzZUWwuXZa/QYQGpvGnHIou6RjgZ1eNEx14WcIjA1rW6IMLuMo3YnEr
FX3oWj59JisRSNzoVxVlRCTM9DBaQr19fq7QZxPEscaVNtC1EziZN9FxaYL4Hcd5OW9CqJ9YDlVw
rjzLmVdZlnR3wlFg1zGATi2rZxgaTJ0YzFBP1L7GUnDsH6VBblZjYWOR+GY73nTm8nCFM3oWoS27
fgSCpXMtnjPJWxC8kDOei0x9JmyX0ahSmu3TiUnkrdvG+LxZsvdrcLFsqFJJiIjNNZj8GQpj1OBo
azVNVWyQpAq4HDSY6nVYSlzhs6aWbEeBjbyaptPxceSFam9WD02fJPDQehoTu1G6gq1UO1wRsgig
jwPQrVqHLgdsDHaOO8kGsiuK0L/ToeBxYm2Q5zztA+Y7kKT134GwVBhu8a1xemFXpAwIgXyXvPM9
nade7BFnIObNoz5kNbHMuG8TzFVC6Im3ZMLDWerhrpyKUT0nVFhn6SJjDa7M9mqpjvU1yQv62I2w
NYlRKAXIucgN53KSEwZqBbhlg51C7txVXFo8gDUZIWAe8+VMO4aVTWU3SzmM6I0SWQF/DtlWqhzD
MFhUoJDxkRmSHjN0xDhkBSRV4DMDKDDd2tyZC77NgQsH8KjHgJQG+eZ4MD+1iJz/VC6Izr4b38WH
dlxSx6gJRtGHZ1jwcjhT8d/ZA8+ThgrTmAvsAnD0CcSnvOo6njy8uKgINCkZzayoSmT8L1XK0VAl
YmG21ka6IxGDkc9F1g0FQZnFMIPvt0uVpLahxmKgr3derYyy3N174GgNAxmQ7n4p/tXrUTDZgNVB
8HHrB71MfDdhyvBqIbSXW8fYiAM+Dwh3Y8xVskbDlT1LH3ELg7zDnmDCRVkMyoE0BeTxq7rzbsI0
cEs7QNopmUhkUgFWbpE6dLDSk/KWlIsR/Etn+LuSKcKEhsWiscA=


--===============1133744651==--