From: marko.makela
Date: December 1 2010 8:03am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3664) Bug#58623
List-Archive: http://lists.mysql.com/commits/125606
X-Bug: 58623
Message-Id: <201012010804.oB17VWE7006554@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1395669625=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDprZXZpbi5sZXdpc0BvcmFjbGUuY29tLTIwMTAxMTMwMTYwMzU1LWt6amVn
Zmg5cG5kNnBiYzMKCiAzNjY0IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTItMDEKICAgICAgQnVnIzU4
NjIzOiBCb2d1cyBkZWJ1ZyBhc3NlcnRpb24gZmFpbHVyZSBpbiBpX3NfbG9ja3Nfcm93X3ZhbGlk
YXRlKCkKICAgICAgCiAgICAgIFRoaXMgYm9ndXMgYXNzZXJ0aW9uIHdhcyBpbnRyb2R1Y2VkIGlu
IHRoZSBmaXggb2YgQnVnICM1NzgwMjoKICAgICAgRW1wdHkgQVNTRVJUSU9OIHBhcmFtZXRlciBw
YXNzZWQgdG8gdGhlIEhBU0hfU0VBUkNIIG1hY3JvLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9y
YWdlL2lubm9kYl9wbHVnaW4vdHJ4L3RyeDBpX3MuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwaV9zLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi90cngvdHJ4MGlfcy5jCXJldmlkOmtldmluLmxld2lzQG9yYWNsZS5jb20tMjAxMDExMzAxNjAz
NTUta3pqZWdmaDlwbmQ2cGJjMworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vdHJ4L3RyeDBp
X3MuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4MDM1My0yaTJxeXAw
aWFyczNudDFpCkBAIC00MzUsNyArNDM1LDcgQEAgaV9zX2xvY2tzX3Jvd192YWxpZGF0ZSgKIAkJ
LyogcmVjb3JkIGxvY2sgKi8KIAkJdXRfYWQoIXN0cmNtcCgiUkVDT1JEIiwgcm93LT5sb2NrX3R5
cGUpKTsKIAkJdXRfYWQocm93LT5sb2NrX2luZGV4ICE9IE5VTEwpOwotCQl1dF9hZChyb3ctPmxv
Y2tfZGF0YSAhPSBOVUxMKTsKKwkJLyogcm93LT5sb2NrX2RhdGEgPT0gTlVMTCBpZiBidWZfcGFn
ZV90cnlfZ2V0KCkgPT0gTlVMTCAqLwogCQl1dF9hZChyb3ctPmxvY2tfcGFnZSAhPSBVTElOVF9V
TkRFRklORUQpOwogCQl1dF9hZChyb3ctPmxvY2tfcmVjICE9IFVMSU5UX1VOREVGSU5FRCk7CiAJ
fQoK

--===============1395669625==
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.1-innodb/
# testament_sha1: 768bb3ef8645a0263020f4c0ba6fdfc4d06d52cb
# timestamp: 2010-12-01 10:04:08 +0200
# base_revision_id: kevin.lewis@stripped\
#   kzjegfh9pnd6pbc3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX1Rpy0AAZ9flEAwWnP/93tn
ngC////wBAAIAFADwbAbe1FWadwyRE2IQ2pgCap4TJkhp5T1PUep6gPRPUBJQmjTIMmpT9CmYoDQ
aANMgAADEgSn6o2UYahgmmhoNA0GhoYgA5piZMmjCYJiaYBMAhgjAjAJKaqe1EzU9T9RPCam1PUG
j0nqGgBkAAeoxrWpr7cideY4WWtFTkulICrq13Wqy/J3jTkaiIOsx/UET5FqRa1f1/LvP06V7Rm7
CFJsQ+7V0dYUxcKu/pzWpBvQZY2pTcG1XLnIUh20T9gwPGbPF5YJtXaewI2A/k+J7tNMfhsP7TUl
kby8kXuKADD23TwxxNgBlTOQAoDOUJgMxPOVmRuNAnl6oh71BBjR023dp4DiBdUDmySBGVAv4/ye
PfeWhOx7kEGVntgnLrcxhnDlBe5eAxNPFXpyw2bnE9zVXy6wOgUOJW/mERFIpztt5D7lrRwadSWP
PiKgu5J+Ap4yTDOzJA4tWaYQmuAdAqWyNGRYjauLso4WmS1HlVZaPVNzoduwT+Cant2y2dWeabrE
rExsDU0oszbK5pgy5RIzmnFl4yUk3O1Py6d7lNQJ2xWqaXmLFWcC4mZGmI+KxxFfqm2PL9OL8n52
l0ap5lUa1M2FJXGG/dR5keRSqzY8WNhTG9loUMnEGlGJCGgRMRvIVeY9lIsk3LXiE+r335Rlv0lC
enF00hREe4XvfTFRmTok/VnGsThrQ1aafibhVT6jc789rDgYDdyrmXOF4f5Ny6L4McQOp5i0z6AL
otPakWw6dqIHy3gLp6MU6HcwH1YAIgaoNYgDwnx5F4rR9LT7jc6SSwpVz0g4pgpmwwcQGDuwRJ6k
BrjWNuhxhb2GSJEjEzjkv4MaDlEJUs6N6pOJZRJEaxrYwK1po0rAPMUD6uGiDPfs12NjRUcZEuDj
bLfLjTDubqMehI/VQ3kBdQ3FDRNUp9qCcS1ilJC4CotMFsUhu0jXgoWHZZgBgHCY/zwcKxxYSKmA
rK1KVwTqgx5COI75TEnJ5YKOhY6mEmbbMb1Ocy4PM8AgOg4AZW+kNtELBUBpGncZANWTE+I2RVUO
JQPyCyBSgfOsoSBIwLM9IcWqMnzZ9jBLYxki7MAVeg0BNfsmp02W9Nzx41xgggijtRLjkKfS1dpN
Q/KCgHBFHf4cW2wAuChwpv9d4AzBwxGokRgSF6i+ERDiDVLelaIU8zAGbfwZLGYvIG6wBpJasyYi
WOwJUwIFBrtB9iTRBkZRJRU7KhARNoGBaN3iiqUMDCMgFIW1KZUSGa8Sy1hppnxqGBCE84jCy8Io
s/iO/lc9Z1ma8mM4XYT9JKSqlQpzOWcRMpmC4U7yYpV/+Iaf8XckU4UJB9UactA=


--===============1395669625==--