From: marko.makela
Date: April 28 2010 1:02pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3425) Bug#53122
List-Archive: http://lists.mysql.com/commits/106821
X-Bug: 53122
Message-Id: <201004281302.o3SD2d6j023121@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1339405318=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjcxMzU0MDctbzhwcjZj
bGM4a3p3MTB1YgoKIDM0MjUgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yOAogICAgICByZWN2X3N5
c19pbml0KCksIHJlY3Zfc3lzX2VtcHR5X2hhc2goKTogU2hyaW5rIHJlY3Zfc3lzLT5hZGRyX2hh
c2guCiAgICAgIHJlY3ZfYWRkcl90OiBUdXJuIHNwYWNlLHBhZ2Vfbm8gaW50byBiaXRmaWVsZHMg
dG8gc2F2ZSBzcGFjZSBvbiA2NC1iaXQuCiAgICAgIChCdWcgIzUzMTIyKQoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9pbmNsdWRlL2xvZzByZWN2LmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2xvZy9sb2cwcmVjdi5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4v
Q2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCTIwMTAtMDQt
MjcgMTM6NTQ6MDcgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwky
MDEwLTA0LTI4IDEzOjAyOjI1ICswMDAwCkBAIC0xLDMgKzEsOSBAQAorMjAxMC0wNC0yOAlUaGUg
SW5ub0RCIFRlYW0KKworCSogbG9nL2xvZzByZWN2LmgsIGxvZy9sb2cwcmVjdi5jOgorCUZpeCBC
dWcjNTMxMjIgSW5ub0RCIHJlY292ZXJ5IHVzZXMgdG9vIGJpZyBhIGhhc2ggdGFibGUgZm9yIHJl
ZG8KKwlsb2cgcmVjb3JkcworCiAyMDEwLTA0LTI3CVRoZSBJbm5vREIgVGVhbQogCiAJKiBoYW5k
bGVyL2hhX2lubm9kYi5jYywgbG9jay9sb2NrMGxvY2suYywgcm93L3JvdzBteXNxbC5jLAoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2xvZzByZWN2Lmgn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2xvZzByZWN2LmgJMjAxMC0wMi0y
MCAxNjo0NTo0MSArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9sb2cw
cmVjdi5oCTIwMTAtMDQtMjggMTM6MDI6MjUgKzAwMDAKQEAgLTM2OCw4ICszNjgsOCBAQCB0eXBl
ZGVmIHN0cnVjdCByZWN2X2FkZHJfc3RydWN0CXJlY3ZfYWRkCiBzdHJ1Y3QgcmVjdl9hZGRyX3N0
cnVjdHsKIAllbnVtIHJlY3ZfYWRkcl9zdGF0ZSBzdGF0ZTsKIAkJCQkvKiE8IHJlY292ZXJ5IHN0
YXRlIG9mIHRoZSBwYWdlICovCi0JdWxpbnQJCXNwYWNlOwkvKiE8IHNwYWNlIGlkICovCi0JdWxp
bnQJCXBhZ2Vfbm87LyohPCBwYWdlIG51bWJlciAqLworCXVuc2lnbmVkCXNwYWNlOjMyOy8qITwg
c3BhY2UgaWQgKi8KKwl1bnNpZ25lZAlwYWdlX25vOjMyOy8qITwgcGFnZSBudW1iZXIgKi8KIAlV
VF9MSVNUX0JBU0VfTk9ERV9UKHJlY3ZfdCkKIAkJCXJlY19saXN0Oy8qITwgbGlzdCBvZiBsb2cg
cmVjb3JkcyBmb3IgdGhpcyBwYWdlICovCiAJaGFzaF9ub2RlX3QJYWRkcl9oYXNoOy8qITwgaGFz
aCBub2RlIGluIHRoZSBoYXNoIGJ1Y2tldCBjaGFpbiAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9sb2cvbG9nMHJlY3YuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2xvZy9sb2cwcmVjdi5jCTIwMTAtMDQtMjYgMTE6MjY6MDkgKzAwMDAKKysrIGIvc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2xvZy9sb2cwcmVjdi5jCTIwMTAtMDQtMjggMTM6MDI6MjUgKzAw
MDAKQEAgLTMyMSw3ICszMjEsNyBAQCByZWN2X3N5c19pbml0KAogCXJlY3Zfc3lzLT5sZW4gPSAw
OwogCXJlY3Zfc3lzLT5yZWNvdmVyZWRfb2Zmc2V0ID0gMDsKIAotCXJlY3Zfc3lzLT5hZGRyX2hh
c2ggPSBoYXNoX2NyZWF0ZShhdmFpbGFibGVfbWVtb3J5IC8gNjQpOworCXJlY3Zfc3lzLT5hZGRy
X2hhc2ggPSBoYXNoX2NyZWF0ZShhdmFpbGFibGVfbWVtb3J5IC8gNTEyKTsKIAlyZWN2X3N5cy0+
bl9hZGRycyA9IDA7CiAKIAlyZWN2X3N5cy0+YXBwbHlfbG9nX3JlY3MgPSBGQUxTRTsKQEAgLTM2
MSw3ICszNjEsNyBAQCByZWN2X3N5c19lbXB0eV9oYXNoKHZvaWQpCiAJaGFzaF90YWJsZV9mcmVl
KHJlY3Zfc3lzLT5hZGRyX2hhc2gpOwogCW1lbV9oZWFwX2VtcHR5KHJlY3Zfc3lzLT5oZWFwKTsK
IAotCXJlY3Zfc3lzLT5hZGRyX2hhc2ggPSBoYXNoX2NyZWF0ZShidWZfcG9vbF9nZXRfY3Vycl9z
aXplKCkgLyAyNTYpOworCXJlY3Zfc3lzLT5hZGRyX2hhc2ggPSBoYXNoX2NyZWF0ZShidWZfcG9v
bF9nZXRfY3Vycl9zaXplKCkgLyA1MTIpOwogfQogCiAjaWZuZGVmIFVOSVZfSE9UQkFDS1VQCgo=

--===============1339405318==
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: efff5dfc26ab98673151ddc36427bd025e9d3fa5
# timestamp: 2010-04-28 16:02:34 +0300
# base_revision_id: marko.makela@stripped\
#   o8pr6clc8kzw10ub
# 
# Begin bundle
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


--===============1339405318==--