From: marko.makela
Date: June 24 2010 6:09am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3120) Bug#57428
List-Archive: http://lists.mysql.com/commits/112017
X-Bug: 57428
Message-Id: <201006240609.o5O63DAG023490@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1076318939=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDA2MDg0Mi1ia2Fn
cGQzdTZxaWk2b2RkCgogMzEyMCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTI0CiAgICAgIEFmdGVy
LXJldmlldyBjbGVhbnVwIG9mIEJ1ZyM1NzQyODogcmVwbGFjZSB0aGUgZHVsaW50IHN0cnVjdCB3
aXRoIGEgNjQtYml0IGludAogICAgICAKICAgICAgdHJ4X3VuZG9fYnVpbGRfcm9sbF9wdHIoKTog
Q2xhcmlmeSB0aGUgYXNzZXJ0aW9uIG9uIGlzX2luc2VydCBiZWluZyAwIG9yIDEuCiAgICAgIAog
ICAgICBUUlhfU1lTX0ZJTEVfRk9STUFUX1RBRzogUmVtb3ZlICJleHRyYSIgc3BhY2UgYWZ0ZXIg
cGVyaW9kIGluIHRoZSBjb21tZW50LgogICAgICBTZWUgYWxzbyBodHRwOi8vZGVza3RvcHB1Yi5h
Ym91dC5jb20vY3MvdHlwZXNwYWNpbmcvYS9vbmV0d29zcGFjZXMuaHRtCgogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwc3lzLmgKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL3RyeDB1bmRvLmljCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvdHJ4MHN5cy5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
dHJ4MHN5cy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI0MDYwODQyLWJr
YWdwZDN1NnFpaTZvZGQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDBzeXMuaAly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyNDA2MDkyOS16N2RqNGJ0bmt5aHFt
MjI5CkBAIC01NjgsMTIgKzU2OCwxMiBAQCBGSUxfUEFHRV9BUkNIX0xPR19OT19PUl9TUEFDRV9O
Ty4gKi8KIChUUlhfU1lTX1BBR0VfTk8gb2YgVFJYX1NZU19TUEFDRSkgKi8KICNkZWZpbmUgVFJY
X1NZU19GSUxFX0ZPUk1BVF9UQUcJCShVTklWX1BBR0VfU0laRSAtIDE2KQogCi0vKiogQ29udGVu
dHMgb2YgVFJYX1NZU19GSUxFX0ZPUk1BVF9UQUcgd2hlbiB2YWxpZC4gIFRoZSBmaWxlIGZvcm1h
dAorLyoqIENvbnRlbnRzIG9mIFRSWF9TWVNfRklMRV9GT1JNQVRfVEFHIHdoZW4gdmFsaWQuIFRo
ZSBmaWxlIGZvcm1hdAogaWRlbnRpZmllciBpcyBhZGRlZCB0byB0aGlzIGNvbnN0YW50LiAqLwog
I2RlZmluZSBUUlhfU1lTX0ZJTEVfRk9STUFUX1RBR19NQUdJQ19OX0xPVwkzNjQ1OTIyMTc3VUwK
IC8qKiBDb250ZW50cyBvZiBUUlhfU1lTX0ZJTEVfRk9STUFUX1RBRys0IHdoZW4gdmFsaWQgKi8K
ICNkZWZpbmUgVFJYX1NZU19GSUxFX0ZPUk1BVF9UQUdfTUFHSUNfTl9ISUdICTI3NDU5ODc3NjVV
TAotLyoqIENvbnRlbnRzIG9mIFRSWF9TWVNfRklMRV9GT1JNQVRfVEFHIHdoZW4gdmFsaWQuICBU
aGUgZmlsZSBmb3JtYXQKKy8qKiBDb250ZW50cyBvZiBUUlhfU1lTX0ZJTEVfRk9STUFUX1RBRyB3
aGVuIHZhbGlkLiBUaGUgZmlsZSBmb3JtYXQKIGlkZW50aWZpZXIgaXMgYWRkZWQgdG8gdGhpcyA2
NC1iaXQgY29uc3RhbnQuICovCiAjZGVmaW5lIFRSWF9TWVNfRklMRV9GT1JNQVRfVEFHX01BR0lD
X04JCQkJCVwKIAkoKGliX3VpbnQ2NF90KSBUUlhfU1lTX0ZJTEVfRk9STUFUX1RBR19NQUdJQ19O
X0hJR0ggPDwgMzIJXAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS90cngwdW5kby5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB1bmRvLmlj
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI0MDYwODQyLWJrYWdwZDN1NnFp
aTZvZGQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB1bmRvLmljCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjI0MDYwOTI5LXo3ZGo0YnRua3locW0yMjkKQEAg
LTQzLDcgKzQzLDcgQEAgdHJ4X3VuZG9fYnVpbGRfcm9sbF9wdHIoCiAjaWYgREFUQV9ST0xMX1BU
Ul9MRU4gIT0gNwogIyBlcnJvciAiREFUQV9ST0xMX1BUUl9MRU4gIT0gNyIKICNlbmRpZgotCXV0
X2FkKGlzX2luc2VydCA8PSAxKTsKKwl1dF9hZChpc19pbnNlcnQgPT0gMCB8fCBpc19pbnNlcnQg
PT0gMSk7CiAJdXRfYWQocnNlZ19pZCA8IFRSWF9TWVNfTl9SU0VHUyk7CiAJdXRfYWQob2Zmc2V0
IDwgNjU1MzYpOwogCgo=

--===============1076318939==
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: 65a5873367338662ac0d0b614afcf84d1084e23d
# timestamp: 2010-06-24 09:09:36 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   bkagpd3u6qii6odd
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ4Im0kAAlfflAAwWnP//3um
nGC////0BAAIAFAE7Xpdband6cKSJyeEkkm0JhogwJDRMxQAyNqGRoyGgSUmij/RFPU/SmT9U0ZP
UAAAAABoAYo0mSbQkaA2kDTQAAZA0AAI9VTygekNAAGgAAAABo0aASSRoaE1PBJ5GRpTATRoG0gA
AaGpnq043+A47vh88jG+ShE+Wt9UBKUyxyzxRyPc5uyO0rKQkkgMu35dwOjRKHppVtBysT0H5U9m
gv2keG9ui5zxcZa1J5OA7/5N3j/O7E/XkRaL4xrHBKwTvpY+RHL0W6N40w/J5twzQRdjkaYigFz8
KvNRmdxqF+UL7i5BbuCzivu33SFmLgIPsL5Y6dSE9uQNqA3nNIXmOu7TZObKPXMJaWZCtuQuUUWG
4mHiiSLkKMeSO3pE8kTAy2E5OXYlEnpFif0VYpWKRoMdEELZOdu1lJPkRfSwpQohstigHYt+NNx1
ixFfG25ZnFg4WQmUkfI4ujo2rahY5nkAp3FOTkh8c1yNYDFItkItNUqJznZm7BDZSaiBTUmLNTh5
HEq3wFYQMxJmGFVkUY5gKRc4mo0JmZUm7UWqyuYsoEnkUw+fK7VqNyJpFxYrfeKlWa6hbDgSgSYW
ERABOJqKojqi+SVTPlIGFXm34S9fawYJuIFlwrXFMigx2ifG8tfLFai20NovEClSWmqoiFq2iqHL
W+gtK3RVa+VrpCcpcpxOHAamHR5GoB8RWSCvbdM2chURYLY6AU+zpbJDBQXKN5wvxVFgM3mDgFFQ
MiIyVYqPWsfge3ZgFLm9hFEPLdxvgLES8V4LKGdmZk3fOiLdH0GkE7Dp4HiMyCPDYtg+NqFopoUj
D2hJP4plhxY0GH0TkcHZdzw+tXHkebDtJRe+jf0CcOcVCXKdfZN7o2VQlsqJ/S6zU9Hatwl5nF+B
hJPdUlDhOJQZHfxF7rx3qyOI7IzF7DGmM9oWTHdMBnj2gMVC4hOxCLCPwE6ForUqxaPIFpe7Opwz
CV8QuCSdd0Sw6poDF/NvXRcVy8gShWOiRpymBZVkJlYLXvGqGtvzFcsgKwrow5q8elF4RVCcANu2
Gh87pR65hh5uLSjb1MOpJ0cihFzdsCHs20zVtZe2mDNq8XHpSXotO2ljYsByGKsXdWjJmv3yRwLY
CfMjwfouEBMc51a8DET+CpX8Oc7Bixgno9bpX9jPQdtzHKYCiXvJvErPACWqAtsxBYvTQ4Ht9yGk
25KTzVuADyBxF1IssvpqUkPHZfNXTih8ppRy487yi0DqNpowE3STrgJfvWi1JUzAYA5GpwMwlDx0
RSJMDUG5sOmKKDxQeJaANwEskd51ph2+1HWUmmUlg6g1lUsikeNGORvHxpFoRjlwiFOBYRzsiASj
JzClcvR0YcycJQHRzVqytNagHRi4a8R5of5CTkQRscujVtsuaPUs+DDB1qNRS78jGmeObnzXLpAg
P2TX0AnkgMxNc6sbzKdDkSZEUsJwIZgSihYX4cJbA07i9xsqESEKIgYsdtcBarxDLIWFauM32oWx
s44hYzjIroCGdymhRUNdcBtqRSqLoRZphcDpYbGMoYK6befrVOEusXbpzXYrKQVWm7zxHZlWlEr5
EnidFxpgUwWqBjmm/I/xh8f8XckU4UJCeCJtJA==


--===============1076318939==--