From: marko.makela
Date: April 6 2011 7:46am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3360 to 3361)
List-Archive: http://lists.mysql.com/commits/134780
Message-Id: <201104060746.p367kWDx012188@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0138671996=="

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

IDMzNjEgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0wNgogICAgICBOb24tZnVuY3Rpb25hbCBjaGFu
Z2U6IG1vdmUgYSBwcmludG91dAogICAgICBmcm9tIGlubm9iYXNlX3NodXRkb3duX2Zvcl9teXNx
bCgpIHRvCiAgICAgIGxvZ3NfZW1wdHlfYW5kX21hcmtfZmlsZXNfYXRfc2h1dGRvd24oKQogICAg
ICB3aGVyZSB0aGUgcmVzdCBvZiB0aGUgbG9naWMgaXMgbG9jYXRlZC4KCiAgICBtb2RpZmllZDoK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMGxvZy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2Uvc3J2L3NydjBzdGFydC5jCiAzMzYwIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDQtMDYKICAgICAg
RW5hYmxlIF9fYXR0cmlidXRlX18oKGNvbGQpKSBvbmx5IGZvciBHQ0MgNC4zIGFuZCBsYXRlci4K
ICAgICAgVGhpcyBhdHRyaWJ1dGUgd2FzIGludHJvZHVjZWQgaW4gYnpyIHJldmlzaW9uLWlkCiAg
ICAgIG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDA1MDczNzU4LWI4eTczM3l2a3F1bTk0
MGkKICAgICAgYW5kIGNhdXNlZCBvbGRlciBHQ0MgdmVyc2lvbnMgdG8gZW1pdCB3YXJuaW5ncy4K
CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL29zMHRocmVhZC5o
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3V0MGRiZy5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91dDB1
dC5oCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwbG9nLmMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzBsb2cuYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDQwNjA2MjIzNi15MTFvMGRkcndneG52dzhpCisrKyBiL3N0b3JhZ2UvaW5u
b2Jhc2UvbG9nL2xvZzBsb2cuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQw
NjA3MzQ0OS03bTRveHM4cnRicHhnejMxCkBAIC0zMTM3LDYgKzMxMzcsMTQgQEAgbG9vcDoKIAls
b2dfYXJjaGl2ZV9hbGwoKTsKICNlbmRpZiAvKiBVTklWX0xPR19BUkNISVZFICovCiAJaWYgKHNy
dl9mYXN0X3NodXRkb3duID09IDIpIHsKKwkJdXRfcHJpbnRfdGltZXN0YW1wKHN0ZGVycik7CisJ
CWZwcmludGYoc3RkZXJyLAorCQkJIiAgSW5ub0RCOiBNeVNRTCBoYXMgcmVxdWVzdGVkIGEgdmVy
eSBmYXN0IHNodXRkb3duIgorCQkJIiB3aXRob3V0IGZsdXNoaW5nICIKKwkJCSJ0aGUgSW5ub0RC
IGJ1ZmZlciBwb29sIHRvIGRhdGEgZmlsZXMuIgorCQkJIiBBdCB0aGUgbmV4dCBteXNxbGQgc3Rh
cnR1cCAiCisJCQkiSW5ub0RCIHdpbGwgZG8gYSBjcmFzaCByZWNvdmVyeSFcbiIpOworCiAJCS8q
IEluIHRoaXMgZmFzdGVzdCBzaHV0ZG93biB3ZSBkbyBub3QgZmx1c2ggdGhlIGJ1ZmZlcgogCQlw
b29sOiBpdCBpcyBlc3NlbnRpYWxseSBhICdjcmFzaCcgb2YgdGhlIElubm9EQgogCQlzZXJ2ZXIu
IE1ha2Ugc3VyZSB0aGF0IHRoZSBsb2cgaXMgYWxsIGZsdXNoZWQgdG8gZGlzaywKCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYycKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTA0MDYwNjIyMzYteTExbzBkZHJ3Z3hudnc4aQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Ny
di9zcnYwc3RhcnQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNjA3MzQ0
OS03bTRveHM4cnRicHhnejMxCkBAIC0yMDk3LDE3ICsyMDk3LDYgQEAgaW5ub2Jhc2Vfc2h1dGRv
d25fZm9yX215c3FsKHZvaWQpCiAJVGhlIHN0ZXAgMSBpcyB0aGUgcmVhbCBJbm5vREIgc2h1dGRv
d24uIFRoZSByZW1haW5pbmcgc3RlcHMgMiAtIC4uLgogCWp1c3QgZnJlZSBkYXRhIHN0cnVjdHVy
ZXMgYWZ0ZXIgdGhlIHNodXRkb3duLiAqLwogCi0KLQlpZiAoc3J2X2Zhc3Rfc2h1dGRvd24gPT0g
MikgewotCQl1dF9wcmludF90aW1lc3RhbXAoc3RkZXJyKTsKLQkJZnByaW50ZihzdGRlcnIsCi0J
CQkiICBJbm5vREI6IE15U1FMIGhhcyByZXF1ZXN0ZWQgYSB2ZXJ5IGZhc3Qgc2h1dGRvd24iCi0J
CQkiIHdpdGhvdXQgZmx1c2hpbmcgIgotCQkJInRoZSBJbm5vREIgYnVmZmVyIHBvb2wgdG8gZGF0
YSBmaWxlcy4iCi0JCQkiIEF0IHRoZSBuZXh0IG15c3FsZCBzdGFydHVwICIKLQkJCSJJbm5vREIg
d2lsbCBkbyBhIGNyYXNoIHJlY292ZXJ5IVxuIik7Ci0JfQotCiAJbG9nc19lbXB0eV9hbmRfbWFy
a19maWxlc19hdF9zaHV0ZG93bigpOwogCiAJaWYgKHNydl9jb25jX25fdGhyZWFkcyAhPSAwKSB7
Cgo=

--===============0138671996==
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: bf1710462b23ee01c00b7caac455b6896d77778f
# timestamp: 2011-04-06 10:46:27 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   y11o0ddrwgxnvw8i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWei3tW0AAljflAAwcmf//3cn
KAS/7//wBAAIAFAE2JLx0OJw21taThJJNJkyaGjaQ2poZEyQDTQA0GgJSoYj1PSD9UZDQAAAAAAA
SKAiNGTUBk0RozRqMmg0xGIPUHMABMmABMJgmEMARgASUJiA0J6IaEnoJpjU00aBoBoDQ0MaVkw4
uB346rGeHYTN/jgq6cePIosDjPOVZT1UjdGzDy+tsS81jbbXl91fKmcgh6CLjFz3W9+rn0Ee/q8u
+cP7Qlh+JfO388HrbmtvIw9Yju9K0mqZIB6Rlrwtxrh64wO+PZ1gcP3fxOuqanwQSyOQ16yjLKZN
efHZo9hvgzxcEL8i6CUwFJv7+Ueqwuy5ITszNuEsOglEtM9VCIpNDeMbsNaFyirzmPXKSFXaWCaR
RUGBiW1ZMg00WxvVpLuFdU3lzK5YK5qCLOTZBC28+BtgP1VoT5XC2Jq5bnUvKiAdU7GiaubxFadn
87DMMFZUamuW9u5CtqM2UPWbMk6w4Tu0pOwREwvRu8WDGeIiUsWh1mtU1l/9Smqm0jmECQjLpMqV
mJ5RA4cyWpuY/ZgWWTQqw12Ehyig3V1bX5gMLVoI4KwemNMQDo+rpC5TfLCEDWzoEVg0RyIUSMLA
2RFUQ264rbYkRYoXSIlpaY02iYSgVYVBsLICeWj6CkoYSFUcSIh92DoDRSyTRhK0NRI2gPg6wCt4
rI5EmkynJ9rrnF8z+LsAqL7YMi1mYGsV8XvFuM2mGmZDMxMS8pI1aOvpFXPFuDH1i0xVYA6uasRW
x5xdh3LVt0hlvG9pGHB7jizi1iWTwK3DTbh4/FSqIpkfpqgP19/i/cdm9wXNwaN/qlTugptXNkDo
kJnGKznOn2nSJWbZ+w19uAlTCCOYSx72EyjznXWlT+WCUQflTyeVZZO5NFyOR3GZ3Heb5rr9Yrpg
dXH2HJLe0MRdvEnjaXnTMeLcLn1bhTFlROeeflqsmcwlrEoVS5HHNrcbc5EzWGUITg56G25oXCmV
dxcKbFTvW1U0Ye+A5Y0yAG6ySfxsH3vWkl7jmRyFbOzGREai3TjXRU2PGbS2O+XRBofVx2SXXOty
ZFsd1dlry+c3Fl1LHRyLKUPvdQLu3kemq84kpy4Cy0CGCw8zoKrS8YQNnhOGym+g2QaIH2W4Dl4R
ieXaFcHuYrA6HG/tZdLBDNDMZHYtgFzlf0ol0OruXlt1za0UT4IzcpTDZATVXCX32IkSVA+aP9iF
KHuEDuJYJMFFmPHHzXMmHxc+zhbIS8AKxvgJT0R5FyZDk4ViRxWnJomTWfLKurc7ENkiy+iISlEj
zTF5p5eilOGTDAy7lDjjzc4S8FOFzQ0SJGmTgkt2YXy+UzP6iWdEFKCtfXyZdC7QOGRhrYwgrY5J
67qIx+AHYabTg2YxXAiGDq4JMK/S1UXXqABUp3vnQoviBCsaivFvKc2zipHWA+yyyM7217Mxw4QM
qGWhm8DrRsuLmbVk7SOcWaj0YG738ipApQiyMKCeAwentowsDqpk5Thrsykb4lqK0UCg0Km6a+/m
4NGPFjXjee3pUBOuV7diN5QvBQXPEisQOKaAwR5C0ls5LeNowCvEkv8Qs/i7kinChIdFvato


--===============0138671996==--