From: marko.makela
Date: May 5 2010 10:37am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3447)
List-Archive: http://lists.mysql.com/commits/107518
Message-Id: <201005051038.o45Abdtt031208@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1168079289=="

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

IDM0NDcgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNSBbbWVyZ2VdCiAgICAgIE1lcmdlCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9y
YWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwkyMDEwLTA0LTI5IDEzOjI3OjQzICswMDAw
CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCTIwMTAtMDUtMDUgMTA6
MDU6MDcgKzAwMDAKQEAgLTI0OTgsNiArMjQ5OCw3IEBAIHJvd19zZWxfZmllbGRfc3RvcmVfaW5f
bXlzcWxfZm9ybWF0KAogCWJ5dGUqCXBhZF9wdHI7CiAKIAl1dF9hZChsZW4gIT0gVU5JVl9TUUxf
TlVMTCk7CisJVU5JVl9NRU1fQVNTRVJUX1JXKGRhdGEsIGxlbik7CiAKIAlzd2l0Y2ggKHRlbXBs
LT50eXBlKSB7CiAJY2FzZSBEQVRBX0lOVDoKQEAgLTI3NDYsNiArMjc0Nyw5IEBAIHJvd19zZWxf
c3RvcmVfbXlzcWxfcmVjKAogCQkJLyogTXlTUUwgYXNzdW1lcyB0aGF0IHRoZSBmaWVsZCBmb3Ig
YW4gU1FMCiAJCQlOVUxMIHZhbHVlIGlzIHNldCB0byB0aGUgZGVmYXVsdCB2YWx1ZS4gKi8KIAor
CQkJVU5JVl9NRU1fQVNTRVJUX1JXKHByZWJ1aWx0LT5kZWZhdWx0X3JlYworCQkJCQkgICArIHRl
bXBsLT5teXNxbF9jb2xfb2Zmc2V0LAorCQkJCQkgICB0ZW1wbC0+bXlzcWxfY29sX2xlbik7CiAJ
CQlteXNxbF9yZWNbdGVtcGwtPm15c3FsX251bGxfYnl0ZV9vZmZzZXRdCiAJCQkJfD0gKGJ5dGUp
IHRlbXBsLT5teXNxbF9udWxsX2JpdF9tYXNrOwogCQkJbWVtY3B5KG15c3FsX3JlYyArIHRlbXBs
LT5teXNxbF9jb2xfb2Zmc2V0LApAQCAtMzA3MCw2ICszMDc0LDExIEBAIHJvd19zZWxfcG9wX2Nh
Y2hlZF9yb3dfZm9yX215c3FsKAogCiAJCWZvciAoaSA9IDA7IGkgPCBwcmVidWlsdC0+bl90ZW1w
bGF0ZTsgaSsrKSB7CiAJCQl0ZW1wbCA9IHByZWJ1aWx0LT5teXNxbF90ZW1wbGF0ZSArIGk7Cisj
aWYgMCAvKiBTb21lIG9mIHRoZSBjYWNoZWRfcmVjIG1heSBsZWdpdGltYXRlbHkgYmUgdW5pbml0
aWFsaXplZC4gKi8KKwkJCVVOSVZfTUVNX0FTU0VSVF9SVyhjYWNoZWRfcmVjCisJCQkJCSAgICsg
dGVtcGwtPm15c3FsX2NvbF9vZmZzZXQsCisJCQkJCSAgIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsK
KyNlbmRpZgogCQkJdXRfbWVtY3B5KGJ1ZiArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAogCQkJ
CSAgY2FjaGVkX3JlYyArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAogCQkJCSAgdGVtcGwtPm15
c3FsX2NvbF9sZW4pOwpAQCAtMzA4NCw2ICszMDkzLDExIEBAIHJvd19zZWxfcG9wX2NhY2hlZF9y
b3dfZm9yX215c3FsKAogCQl9CiAJfQogCWVsc2UgeworI2lmIDAgLyogU29tZSBvZiB0aGUgY2Fj
aGVkX3JlYyBtYXkgbGVnaXRpbWF0ZWx5IGJlIHVuaW5pdGlhbGl6ZWQuICovCisJCVVOSVZfTUVN
X0FTU0VSVF9SVyhwcmVidWlsdC0+ZmV0Y2hfY2FjaGUKKwkJCQkgICBbcHJlYnVpbHQtPmZldGNo
X2NhY2hlX2ZpcnN0XSwKKwkJCQkgICBwcmVidWlsdC0+bXlzcWxfcHJlZml4X2xlbik7CisjZW5k
aWYKIAkJdXRfbWVtY3B5KGJ1ZiwKIAkJCSAgcHJlYnVpbHQtPmZldGNoX2NhY2hlW3ByZWJ1aWx0
LT5mZXRjaF9jYWNoZV9maXJzdF0sCiAJCQkgIHByZWJ1aWx0LT5teXNxbF9wcmVmaXhfbGVuKTsK
QEAgLTMxMzQsNiArMzE0OCw4IEBAIHJvd19zZWxfcHVzaF9jYWNoZV9yb3dfZm9yX215c3FsKAog
CX0KIAogCXV0X2FkKHByZWJ1aWx0LT5mZXRjaF9jYWNoZV9maXJzdCA9PSAwKTsKKwlVTklWX01F
TV9JTlZBTElEKHByZWJ1aWx0LT5mZXRjaF9jYWNoZVtwcmVidWlsdC0+bl9mZXRjaF9jYWNoZWRd
LAorCQkJIHByZWJ1aWx0LT5teXNxbF9yb3dfbGVuKTsKIAogCWlmIChVTklWX1VOTElLRUxZKCFy
b3dfc2VsX3N0b3JlX215c3FsX3JlYygKIAkJCQkgIHByZWJ1aWx0LT5mZXRjaF9jYWNoZVsKCg==

--===============1168079289==
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: 2e6f42bc7a2b45f48026cc339ad2a75b806c5694
# timestamp: 2010-05-05 13:38:00 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   fwuux50ypjclvr8n
# 
# Begin bundle
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
4UJAtiBnzA==


--===============1168079289==--