From: marko.makela
Date: August 19 2010 12:41pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3260 to 3262) Bug#56114
List-Archive: http://lists.mysql.com/commits/116244
X-Bug: 56114
Message-Id: <201008191241.o7JBXgc4011228@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0936917717=="

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

IDMyNjIgTWFya28gTcOka2Vsw6QJMjAxMC0wOC0xOQogICAgICBCdWcjNTYxMTQgRGlzYWxsb3cg
dHJ4LT5kaWN0X29wZXJhdGlvbl9sb2NrX21vZGU9PVJXX1hfTEFUQ0ggaW4gc3J2X3N1c3BlbmRf
bXlzcWxfdGhyZWFkKCkKICAgICAgCiAgICAgIFRyaWdnZXIgYW4gYXNzZXJ0aW9uIGZhaWx1cmUg
d2hlbgogICAgICB0cngtPmRpY3Rfb3BlcmF0aW9uX2xvY2tfbW9kZSBpcyBuZWl0aGVyIDAgbm9y
IFJXX1NfTEFUQ0ggaW4KICAgICAgc3J2X3N1c3BlbmRfbXlzcWxfdGhyZWFkKCkuIFRyYW5zYWN0
aW9ucyB0aGF0IG1vZGlmeSBJbm5vREIKICAgICAgZGF0YSBkaWN0aW9uYXJ5IHRhYmxlcyBtdXN0
IGJlIGZyZWUgb2YgbG9jayB3YWl0cywgYmVjYXVzZSB0aGV5CiAgICAgIG11c3QgYmUgaG9sZGlu
ZyB0aGUgZGF0YSBkaWN0aW9uYXJ5IGxhdGNoIGluIGV4Y2x1c2l2ZSBtb2RlLgogICAgICBUaGUg
dHJhbnNhY3Rpb25zIG11c3Qgbm90IGJlIGFjY2Vzc2luZyBhbnkgb3RoZXIgdGFibGVzIG90aGVy
IHRoYW4KICAgICAgdGhlIGRhdGEgZGljdGlvbmFyeSB0YWJsZXMuCiAgICAgIAogICAgICBUaGUg
aGFuZGxpbmcgb2YgUldfWF9MQVRDSCB3YXMgYWNjaWRlbnRhbGx5IGFkZGVkIGluIHRoZSBJbm5v
REIgUGx1Z2luLAogICAgICBhcyBhIHdyb25nIGZpeCBvZiBhbiBhc3NlcnRpb24gZmFpbHVyZS4g
KEZhc3QgaW5kZXggY3JlYXRpb24gd2FzIGFjY2Vzc2luZwogICAgICBib3RoIGRhdGEgZGljdGlv
bmFyeSB0YWJsZXMgYW5kIHVzZXIgdGFibGVzIGluIHRoZSBzYW1lIHRyYW5zYWN0aW9uLikKCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5jCiAzMjYxIE1h
cmtvIE3DpGtlbMOkCTIwMTAtMDgtMTkgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjUtaW5u
b2RiIHRvIG15c3FsLXRydW5rLWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9zcnYvc3J2MHNydi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFy
dC5jCiAzMjYwIFZhc2lsIERpbW92CTIwMTAtMDgtMTkKICAgICAgRGlzYWJsZSAyIHBlcmZzY2hl
bWEgZmFpbGluZyB0ZXN0cyB1bnRpbCB0aGV5IGFyZSBmaXhlZAoKICAgIG1vZGlmaWVkOgogICAg
ICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9kaXNhYmxlZC5kZWYKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzcnYuYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9zcnYvc3J2MHNydi5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA4MTkx
MTE4MzYtYzJ4NTFuaW5qNHdvcnM4dQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA4MTkxMjM2MDktNWxyeWZtOHpt
Yjh0MWZxcQpAQCAtMTU4NywxNCArMTU4NywyMCBAQCBzcnZfc3VzcGVuZF9teXNxbF90aHJlYWQo
CiAJaGFkX2RpY3RfbG9jayA9IHRyeC0+ZGljdF9vcGVyYXRpb25fbG9ja19tb2RlOwogCiAJc3dp
dGNoIChoYWRfZGljdF9sb2NrKSB7CisJY2FzZSAwOgorCQlicmVhazsKIAljYXNlIFJXX1NfTEFU
Q0g6CiAJCS8qIFJlbGVhc2UgZm9yZWlnbiBrZXkgY2hlY2sgbGF0Y2ggKi8KIAkJcm93X215c3Fs
X3VuZnJlZXplX2RhdGFfZGljdGlvbmFyeSh0cngpOwogCQlicmVhazsKLQljYXNlIFJXX1hfTEFU
Q0g6Ci0JCS8qIFJlbGVhc2UgZmFzdCBpbmRleCBjcmVhdGlvbiBsYXRjaCAqLwotCQlyb3dfbXlz
cWxfdW5sb2NrX2RhdGFfZGljdGlvbmFyeSh0cngpOwotCQlicmVhazsKKwlkZWZhdWx0OgorCQkv
KiBUaGVyZSBzaG91bGQgbmV2ZXIgYmUgYSBsb2NrIHdhaXQgd2hlbiB0aGUKKwkJZGljdGlvbmFy
eSBsYXRjaCBpcyByZXNlcnZlZCBpbiBYIG1vZGUuICBEaWN0aW9uYXJ5CisJCXRyYW5zYWN0aW9u
cyBzaG91bGQgb25seSBhY3F1aXJlIGxvY2tzIG9uIGRpY3Rpb25hcnkKKwkJdGFibGVzLCBub3Qg
b3RoZXIgdGFibGVzLiBBbGwgYWNjZXNzIHRvIGRpY3Rpb25hcnkKKwkJdGFibGVzIHNob3VsZCBi
ZSBjb3ZlcmVkIGJ5IGRpY3Rpb25hcnkKKwkJdHJhbnNhY3Rpb25zLiAqLworCQl1dF9lcnJvcjsK
IAl9CiAKIAl1dF9hKHRyeC0+ZGljdF9vcGVyYXRpb25fbG9ja19tb2RlID09IDApOwpAQCAtMTYw
NiwxMyArMTYxMiw4IEBAIHNydl9zdXNwZW5kX215c3FsX3RocmVhZCgKIAkvKiBBZnRlciByZXN1
bWluZywgcmVhY3F1aXJlIHRoZSBkYXRhIGRpY3Rpb25hcnkgbGF0Y2ggaWYKIAluZWNlc3Nhcnku
ICovCiAKLQlzd2l0Y2ggKGhhZF9kaWN0X2xvY2spIHsKLQljYXNlIFJXX1NfTEFUQ0g6CisJaWYg
KGhhZF9kaWN0X2xvY2spIHsKIAkJcm93X215c3FsX2ZyZWV6ZV9kYXRhX2RpY3Rpb25hcnkodHJ4
KTsKLQkJYnJlYWs7Ci0JY2FzZSBSV19YX0xBVENIOgotCQlyb3dfbXlzcWxfbG9ja19kYXRhX2Rp
Y3Rpb25hcnkodHJ4KTsKLQkJYnJlYWs7CiAJfQogCiAJaWYgKHdhc19kZWNsYXJlZF9pbnNpZGVf
aW5ub2RiKSB7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0
YXJ0LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jCXJldmlkOnZhc2ls
LmRpbW92QG9yYWNsZS5jb20tMjAxMDA4MTkxMTE4MzYtYzJ4NTFuaW5qNHdvcnM4dQorKysgYi9z
dG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDgxOTEyMzYwOS01bHJ5Zm04em1iOHQxZnFxCkBAIC0xMzM0LDggKzEzMzQsMjcg
QEAgaW5ub2Jhc2Vfc3RhcnRfb3JfY3JlYXRlX2Zvcl9teXNxbCh2b2lkKQogCWZpbF9pbml0KHNy
dl9maWxlX3Blcl90YWJsZSA/IDUwMDAwIDogNTAwMCwKIAkJIHNydl9tYXhfbl9vcGVuX2ZpbGVz
KTsKIAorCS8qIFByaW50IHRpbWUgdG8gaW5pdGlhbGl6ZSB0aGUgYnVmZmVyIHBvb2wgKi8KKwl1
dF9wcmludF90aW1lc3RhbXAoc3RkZXJyKTsKKwlmcHJpbnRmKHN0ZGVyciwKKwkJIiBJbm5vREI6
IEluaXRpYWxpemluZyBidWZmZXIgcG9vbCwgc2l6ZSA9Iik7CisKKwlpZiAoc3J2X2J1Zl9wb29s
X3NpemUgPj0gMTAyNCAqIDEwMjQgKiAxMDI0KSB7CisJCWZwcmludGYoc3RkZXJyLAorCQkJIiAl
LjFmR1xuIiwKKwkJCSgoZG91YmxlKSBzcnZfYnVmX3Bvb2xfc2l6ZSkgLyAoMTAyNCAqIDEwMjQg
KiAxMDI0KSk7CisJfSBlbHNlIHsKKwkJZnByaW50ZihzdGRlcnIsCisJCQkiICUuMWZNXG4iLAor
CQkJKChkb3VibGUpIHNydl9idWZfcG9vbF9zaXplKSAvICgxMDI0ICogMTAyNCkpOworCX0KKwog
CWVyciA9IGJ1Zl9wb29sX2luaXQoc3J2X2J1Zl9wb29sX3NpemUsIHNydl9idWZfcG9vbF9pbnN0
YW5jZXMpOwogCisJdXRfcHJpbnRfdGltZXN0YW1wKHN0ZGVycik7CisJZnByaW50ZihzdGRlcnIs
CisJCSIgSW5ub0RCOiBDb21wbGV0ZWQgaW5pdGlhbGl6YXRpb24gb2YgYnVmZmVyIHBvb2xcbiIp
OworCiAJaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7CiAJCWZwcmludGYoc3RkZXJyLAogCQkJIklu
bm9EQjogRmF0YWwgZXJyb3I6IGNhbm5vdCBhbGxvY2F0ZSB0aGUgbWVtb3J5IgoK

--===============0936917717==
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/next-mr/
# testament_sha1: e25f41c0b5e7f55d6f5ace420acd4978d8cc3535
# timestamp: 2010-08-19 15:41:40 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   c2x51ninj4wors8u
# 
# Begin bundle
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


--===============0936917717==--