From: marko.makela
Date: April 27 2010 1:47pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3422)
List-Archive: http://lists.mysql.com/commits/106669
Message-Id: <201004271347.o3RDeLps031011@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0324856113=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjYxMzEwMjktMWZmamE2
OWg2bjg4cTZibwoKIDM0MjIgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNwogICAgICByb3dfbWVy
Z2VfZHJvcF90ZW1wX2luZGV4ZXMoKTogUmVtb3ZlIGEgYm9ndXMgY2hhci10by11bGludCBjYXN0
LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJn
ZS5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJn
ZS5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJnZS5jCTIwMTAtMDIt
MjQgMDg6NTY6NDMgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbWVy
Z2UuYwkyMDEwLTA0LTI3IDEzOjQ3OjM4ICswMDAwCkBAIC0yMDcwLDcgKzIwNzAsNyBAQCByb3df
bWVyZ2VfZHJvcF90ZW1wX2luZGV4ZXModm9pZCkKIAkJZmllbGQgPSByZWNfZ2V0X250aF9maWVs
ZF9vbGQocmVjLCBESUNUX1NZU19JTkRFWEVTX05BTUVfRklFTEQsCiAJCQkJCSAgICAgICZsZW4p
OwogCQlpZiAobGVuID09IFVOSVZfU1FMX05VTEwgfHwgbGVuID09IDAKLQkJICAgIHx8IG1hY2hf
cmVhZF9mcm9tXzEoZmllbGQpICE9ICh1bGludCkgVEVNUF9JTkRFWF9QUkVGSVgpIHsKKwkJICAg
IHx8IChjaGFyKSAqZmllbGQgIT0gVEVNUF9JTkRFWF9QUkVGSVgpIHsKIAkJCWNvbnRpbnVlOwog
CQl9CiAKCg==

--===============0324856113==
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: 5954d258bfde8489a0a734c918ac92575c7b6cbf
# timestamp: 2010-04-27 16:47:48 +0300
# base_revision_id: marko.makela@stripped\
#   1ffja69h6n88q6bo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVJo4w4AAbffgEAwe3P//1cj
VEC////8UAPS8Acga9Lm4ZSEMgGQ09QZBhAAAANqNAamk9UaaGEepp6QaaAAAANA0GgSiaFT8ijZ
Tag9QBoA0DRkMh6mIAZKQzUPUaDI0PSAA0AAAAASSENCYKeQ0p+qn4mRhKe1TyM1T1AxNHqZHTM3
qYhlKNY1QGhkEhoq1SywYATXJLVFlxDmuL822+HlERDryRIbIIOBIS/ewcN86SgcvZ0KJgvRCMgh
S8zy4rEAlWN5DzoAWS4uQIwsoMiyJOKnGEBx3vnYSBGZoL7RD6hAJJA07/tmy3Y4xq3IUoiSwm7Z
OqMKJRMzUNrrEMg2A5PEQDZmlUiuGmOwvN5xsPkGtWI5M3pG5A9OOND4BaQYtpuUp1FzOsfYzlB7
HRo27cb3V1EA5WmhBPBwiKd1IW1V2JEteowLM6oFtFMFP6pazWRMz2iPJk6klHgMajOESqYWQOUt
cQZQGFa+cDInJYf9pHGkIuLxe8hdh2M9dW1QMWtNZn6GCLB4SEu4Ul8hpUXOGJ6NIWVmKxV6zhqN
3JVCyudgJx7TC1IkkxVZUolZmqJhYokyDMYZyoryVVMCYuTDgzhMSeBATqIkigL0jVNvtT9WVYpU
j5FARnJ2FV5PMrUTAp62136VmP6Fe/aUZeHqOzC0HEWc1hZwCFT0VV9rnZ9F0JImnPzvvaIZdMR8
WzWGrBO+DB4P0eMuLTZoBkHuvQ+Ij8TdoivMOD+RHWwrgFW1icWiIjzZebg8Th0OAQLyf9Fp2+q6
cgYiHeeR1PIxpBwU1BcXBOeZ94E+Xr86ILKRhDXCIbu2wwwJ05N2E4vnUGaTqLUOF0l/ev7pkiwh
ea3RE4tHcdxORy4M+kYO+f8irh9UjR60w7EyO22Foc9AVn4aktlUtAFE6he8PHA2HMvgNs584kAi
Yloyf0kEInFL65ow2DCEIAmKgfETeUougINBBiBql5oGozZ+Ir5TEweDzDvCWnPx54wmvApWgDc+
NSwLvf4Ah0B4kW5JQkPqBCGJxGLkQAiIELtMHINFJplm9WwxsMM10WpOEsmhuQt4uCeLI30hFHcL
uFK+G7J+vY64GZDJ2+7ucIl1QXgLYkRA3yC/0ROFCcaLtRslQuJGEd8MYwzmw2BgBW8pQTVmNCA0
zKBNIHG8SfTr0qjSQjFEJJstvVBlQ5rpklJOS+yDCrabbKUloCwScDWWIjrWl3dcCHeQWiiw1L2+
MYJBMKmJGVjjCXY+ayFEVT5XATSC2/Z0AotZmpL7Da/EXGW68qv4u5IpwoSCk0cYcA==


--===============0324856113==--