From: marko.makela
Date: June 2 2010 10:50am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3135)
List-Archive: http://lists.mysql.com/commits/109939
Message-Id: <201006021050.o52AFOV8001263@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0041423787=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA2MDIwNTI2MzEtMmpjNGxj
ZzYzMHhzajMwdgoKIDMxMzUgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wMgogICAgICBNZXJnZSBm
cm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2bm86IDM0OTMK
ICAgICAgY29tbWl0dGVyOiBNYXJrbyBNw6RrZWzDpCA8bWFya28ubWFrZWxhQG9yYWNsZS5jb20+
CiAgICAgIGJyYW5jaCBuaWNrOiA1LjEtaW5ub2RiCiAgICAgIHRpbWVzdGFtcDogV2VkIDIwMTAt
MDYtMDIgMTM6MTk6NDAgKzAzMDAKICAgICAgbWVzc2FnZToKICAgICAgICBmaWxfcHJpbnRfb3Jw
aGFuZWRfdGFibGVzcGFjZXMoKTogVW51c2VkIGZ1bmN0aW9uLCByZW1vdmUuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvZmlsMGZpbC5oCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2ZpbC9maWwwZmlsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwly
ZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA2MDIwNTI2MzEtMmpjNGxjZzYzMHhzajMw
dgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA2MDIxMDUwNDUtMzBtZGg0OWdlcW1vZ3RzaQpAQCAtMzU2NCwzOSAr
MzU2NCw2IEBAIG5leHRfZGF0YWRpcl9pdGVtOgogCXJldHVybihlcnIpOwogfQogCi0vKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCi1JZiB3ZSBuZWVkIGNyYXNoIHJlY292ZXJ5LCBhbmQgd2UgaGF2ZSBjYWxsZWQK
LWZpbF9sb2FkX3NpbmdsZV90YWJsZV90YWJsZXNwYWNlcygpIGFuZCBkaWN0X2xvYWRfc2luZ2xl
X3RhYmxlX3RhYmxlc3BhY2VzKCksCi13ZSBjYW4gY2FsbCB0aGlzIGZ1bmN0aW9uIHRvIHByaW50
IGFuIGVycm9yIG1lc3NhZ2Ugb2Ygb3JwaGFuZWQgLmliZCBmaWxlcwotZm9yIHdoaWNoIHRoZXJl
IGlzIG5vdCBhIGRhdGEgZGljdGlvbmFyeSBlbnRyeSB3aXRoIGEgbWF0Y2hpbmcgdGFibGUgbmFt
ZQotYW5kIHNwYWNlIGlkLiAqLwotVU5JVl9JTlRFUk4KLXZvaWQKLWZpbF9wcmludF9vcnBoYW5l
ZF90YWJsZXNwYWNlcyh2b2lkKQotLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSov
Ci17Ci0JZmlsX3NwYWNlX3QqCXNwYWNlOwotCi0JbXV0ZXhfZW50ZXIoJmZpbF9zeXN0ZW0tPm11
dGV4KTsKLQotCXNwYWNlID0gVVRfTElTVF9HRVRfRklSU1QoZmlsX3N5c3RlbS0+c3BhY2VfbGlz
dCk7Ci0KLQl3aGlsZSAoc3BhY2UpIHsKLQkJaWYgKHNwYWNlLT5wdXJwb3NlID09IEZJTF9UQUJM
RVNQQUNFICYmIHNwYWNlLT5pZCAhPSAwCi0JCSAgICAmJiAhc3BhY2UtPm1hcmspIHsKLQkJCWZw
dXRzKCJJbm5vREI6IFdhcm5pbmc6IHRhYmxlc3BhY2UgIiwgc3RkZXJyKTsKLQkJCXV0X3ByaW50
X2ZpbGVuYW1lKHN0ZGVyciwgc3BhY2UtPm5hbWUpOwotCQkJZnByaW50ZihzdGRlcnIsICIgb2Yg
aWQgJWx1IGhhcyBubyBtYXRjaGluZyB0YWJsZSBpblxuIgotCQkJCSJJbm5vREI6IHRoZSBJbm5v
REIgZGF0YSBkaWN0aW9uYXJ5LlxuIiwKLQkJCQkodWxvbmcpIHNwYWNlLT5pZCk7Ci0JCX0KLQot
CQlzcGFjZSA9IFVUX0xJU1RfR0VUX05FWFQoc3BhY2VfbGlzdCwgc3BhY2UpOwotCX0KLQotCW11
dGV4X2V4aXQoJmZpbF9zeXN0ZW0tPm11dGV4KTsKLX0KLQogLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1
cm5zIFRSVUUgaWYgYSBzaW5nbGUtdGFibGUgdGFibGVzcGFjZSBkb2VzIG5vdCBleGlzdCBpbiB0
aGUgbWVtb3J5IGNhY2hlLAogb3IgaXMgYmVpbmcgZGVsZXRlZCB0aGVyZS4KCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZmlsMGZpbC5oJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvZmlsMGZpbC5oCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0y
MDEwMDYwMjA1MjYzMS0yamM0bGNnNjMweHNqMzB2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9maWwwZmlsLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDIxMDUw
NDUtMzBtZGg0OWdlcW1vZ3RzaQpAQCAtNTA2LDE2ICs1MDYsNiBAQCBVTklWX0lOVEVSTgogdWxp
bnQKIGZpbF9sb2FkX3NpbmdsZV90YWJsZV90YWJsZXNwYWNlcyh2b2lkKTsKIC8qPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwotLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotSWYgd2UgbmVl
ZCBjcmFzaCByZWNvdmVyeSwgYW5kIHdlIGhhdmUgY2FsbGVkCi1maWxfbG9hZF9zaW5nbGVfdGFi
bGVfdGFibGVzcGFjZXMoKSBhbmQgZGljdF9sb2FkX3NpbmdsZV90YWJsZV90YWJsZXNwYWNlcygp
LAotd2UgY2FuIGNhbGwgdGhpcyBmdW5jdGlvbiB0byBwcmludCBhbiBlcnJvciBtZXNzYWdlIG9m
IG9ycGhhbmVkIC5pYmQgZmlsZXMKLWZvciB3aGljaCB0aGVyZSBpcyBub3QgYSBkYXRhIGRpY3Rp
b25hcnkgZW50cnkgd2l0aCBhIG1hdGNoaW5nIHRhYmxlIG5hbWUKLWFuZCBzcGFjZSBpZC4gKi8K
LVVOSVZfSU5URVJOCi12b2lkCi1maWxfcHJpbnRfb3JwaGFuZWRfdGFibGVzcGFjZXModm9pZCk7
Ci0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KIC8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgog
UmV0dXJucyBUUlVFIGlmIGEgc2luZ2xlLXRhYmxlIHRhYmxlc3BhY2UgZG9lcyBub3QgZXhpc3Qg
aW4gdGhlIG1lbW9yeSBjYWNoZSwKIG9yIGlzIGJlaW5nIGRlbGV0ZWQgdGhlcmUuCgo=

--===============0041423787==
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: 650ed8aa1928b18c8569baf5ebea4e61e3e7e598
# timestamp: 2010-06-02 13:50:51 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   2jc4lcg630xsj30v
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcmG2UMAAkJflAAQUm//91MC
AoC///9wBAAIAFAEbTzlKrs0clGlCSiT1M1E8TSeU9pGp6ZBqaaaANABJSaDBDJoJQ0b1Q00GQBi
AQ0qep+qeUeoZHqGg0ADQPUAAMBoAABoAAAAAAkiCJk9E00SeyAk9CfqJogDTamqmpgvPkcsbMsj
6lFXoZncrHNIMQwhPE57ckkeORztJMIQAAOMp92LWfQ+e1UxhAwK0Io+kt4gU28o/Erl1gW9GmDE
p9UMrGP96IHpTxAiYKhZSMavnrhvb23Yl0/sKCFcqAMBaJLxTCrJcHj67mqZmdVADFeCcuBuLYTL
tVJpGsb5uhXnIS5Chpj8kjT6VbgKgKEFYLI1RSLrysrjFOwyidTA7eVU7NtouAnEtVJisVSDxKEw
OOYHY2JY3AUYvhbpQpu7K0O9VPDHcmfMU8TWnvpZExGCfq+mHQs04Qq3JDTXMLRlg892+6rIU9rI
l7sM3uIxIsd97mC5G6hjSQHgthNuo7ZzFooiy2WIsyHVge0whhjuaTvW7C0ecdLRt8ALrSHM3vqZ
AYEVuK5y/o8v0A6mbu0mBAnveZFHRb8RzwcvJCljC5NBLEkRNZvUATpS8VFPrDzMlFlordjInMKO
oAyl4rs8hnF4mxosiLl8ximoLSocvJFjWz3tcYCthEWorJVlB1C69uL7ISE9PGEnizZJppZqQZIq
SKTHgcl1LVnxRWEjkmDwQshISBVOU4MNUIg0KbjJrg4joPIr02mQQc0Id/I9SgsjqmEazUmYb+Hk
Ip4jBdFmoyH5+/nANnz8RniK48CJuFcOZ2gpmR56+Z1pJxO8mWo4BfCo8tKdyxkl+R6S7dsxde42
lB+wmt5cdHSYsFw9VxcXc0ExI6DjCtE5Q/6nRcTlBhkk6uSWzZDan5+lcg7SD0LCMkV1euxj2E+W
xapigVHIDorLNp6Wp0l+WKx+cuOJcTH3VNmWFA/gUD9ZwY2cyo3y/UstkoOL7tmll8dk+1jvhp4i
XEHpgaQLYVndTsqnhqDOKRDcwG7WM54tL6rSMcVS+Ci/CiJixhvf8HsOc2LmZsVBbfNLQD2PUDvU
w15tAfMWdHLkyO2ZcXlPyhpytXU4CREuaprW1E2ZS9IUOzTI3IvGmDFxUarqEwtBfZWi8SzXwwLM
LUa3CDAvunLEkwe1u39q5qs7AHYFgf0d0w/AwXkBQjS9fItHWIFKipTXSdQnJEFgyHi7rlKQorPJ
WKDJmD4dePUSkGFAGboC8Xc08klyh69Xa1VgesZzXdgwGq6LtYXuqB4MFYI6lsUp5QTTK7JiVauv
lKPYqeYmX0IQoPeX3GbFpUBvQ5ooGjGr+2CoWGbMqgroO41DswpOGzPRBEgaK74gNCh3mkl0MBPw
l7FYqiwIJ0TOKb0TubblL/wofc/Qu5IpwoSGTDbKGA==


--===============0041423787==--