From: marko.makela
Date: April 21 2010 9:17am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3407 to 3408)
List-Archive: http://lists.mysql.com/commits/106208
Message-Id: <201004210917.o3L9HkO2022510@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1981557714=="

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

IDM0MDggTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMQogICAgICByZWNfY29udmVydF9kdHVwbGVf
dG9fcmVjKCk6IENvcnJlY3QgdGhlIGRlYnVnIGNoZWNrLgogICAgICBUaGUgImV4dGVybiIgYWNj
ZXNzb3IgZnVuY3Rpb25zIHJldHVybiB6ZXJvIG9yIG5vbnplcm8sIG5vdCAwIG9yIDEuCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yZW0vcmVtMHJlYy5jCiAzNDA3
IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDQtMjEKICAgICAgcmVjX2NvbnZlcnRfZHR1cGxlX3RvX3Jl
YygpOiBBZGQgYSBkZWJ1ZyBjaGVjay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL3JlbS9yZW0wcmVjLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9yZW0vcmVtMHJlYy5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcmVtL3Jl
bTByZWMuYwkyMDEwLTA0LTIxIDA2OjM5OjE2ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9yZW0vcmVtMHJlYy5jCTIwMTAtMDQtMjEgMDk6MTY6MTEgKzAwMDAKQEAgLTEyMjUsOCAr
MTIyNSw4IEBAIHJlY19jb252ZXJ0X2R0dXBsZV90b19yZWMoCiAJCSAgICAgID09IHJlY19vZmZz
X25fZmllbGRzKG9mZnNldHMpKTsKIAogCQlmb3IgKGkgPSAwOyBpIDwgcmVjX29mZnNfbl9maWVs
ZHMob2Zmc2V0cyk7IGkrKykgewotCQkJdXRfYWQoZGZpZWxkX2lzX2V4dChkdHVwbGVfZ2V0X250
aF9maWVsZChkdHVwbGUsIGkpKQotCQkJICAgICAgPT0gcmVjX29mZnNfbnRoX2V4dGVybihvZmZz
ZXRzLCBpKSk7CisJCQl1dF9hZCghZGZpZWxkX2lzX2V4dChkdHVwbGVfZ2V0X250aF9maWVsZChk
dHVwbGUsIGkpKQorCQkJICAgICAgPT0gIXJlY19vZmZzX250aF9leHRlcm4ob2Zmc2V0cywgaSkp
OwogCQl9CiAKIAkJaWYgKFVOSVZfTElLRUxZX05VTEwoaGVhcCkpIHsKCg==

--===============1981557714==
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: 8bfa37f54eaafce3025c22d31642303e3533eb6c
# timestamp: 2010-04-21 12:17:26 +0300
# base_revision_id: marko.makela@stripped\
#   h3gwjea7jzjilyww
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS+9zOsAAa3fgFAwe2f//1sC
BAC////wUAPNPdCc3arXuy88JJIAnqTGRiaMmqfqngTU9RoNDNRkCSinplMYp5SB6mgGgDTQ0AAa
CSTIkyGkzUmNpT1MnpNoanoDQ0NQAySjE0ZNGjQZNGjRkNAyBoNAJJBTGk02inhU/RJo09TNEaGD
RBiGeKIiB9GuO/a3n3Ot8K1jJ7S5NkGuIDZe5roL6VT8O1ObOZsrMxw37iUU+ZGcm0M/VfZusxn9
3zMWs9Hm0RhseP035YNDD+lej2hqw22Hdnb9zcLgHabIF4MLqQKc7+bo9mVtUGjlzxK4N2y7ap8o
j0W1Q5FbwDf6sKq51rVLOkZkjdkZb496Ktl1CT2abc1iQ8cIsUEh6gFxa5K0ZmHmbqNSwUkaMYs+
Kloigc7BRyCjYoJ+S2uxX9nFibi0RxWyFXW8pv2QkPXpCOKQwiHiMfEycxoMa08MPJvJGBiMUlYU
6ECBoSuXIFfbEzUig3ht2boLXBzxDDisrsHlZzizgZqZeespHjzYYUaiw7E8VyomsUUG32FLANQw
tSpCZVuHGaNFQtUxNfZRjWr1gRKLBSHIcRCLr3JtTcVCZeQuZMKsaxhYqNoF4rFirKwJGmD2b0oJ
hNOvLwfcq5bWbp9juYWhjz5+rkMz1muTxtYdt+rrO7xekip5PxroSJGRhj51SmiVT5Odq+0rdsKb
IwTinjSKraFWIgLk42kBcEj/TyySPbVYPDtSO6ZbC3OQuNIlwxVVJipNefC0GJIAlTqzRwXMeYol
OalVH0yT1+OyOCaSRLIkRonU1NOsuylF2jpiWEVNWwtWPYYoXC89jRNgZBLtSXjy/yiKOOJ6l87c
XqEGee4eGHITmwvMzzPcFpHS3JkRlt2MSJ3hUcVxjbA7WIM9i5pU1ZV1cc7yhFhmNpPN+9+JVc5T
G53x5bxR5OwvT5BeU3SDaO5Qb+vtfepkPeW5zFyETIxeG8IFXOFc+Gj4qAJH6QN1wouLC5BnEdAq
NSbvekPCwFjOkIOOSwSFKQIxnicXXAYOgkIdxIbkiNAUUcLYVBYcuGeA7Bd9J1pkvqbcF1Amz9EJ
+ao6ars4yoyGTkOLxkjCaCXGwFMBezo40PubukTg9e26BS5pbJi221SREgalO0kg3jRGrK05JW19
V+vKuH3RhOLTm6OzsntwUBWrLAcs7gnCZjYKadckoYbToe8vnEiweAzSKChlxhBF0+HXZzdNhlwq
+BFkmG0WvGxxjSNLQeE1e0gxV0pzgJixcGyOVFczX0CziiGXRIDsj6uXuDoCIrNbM14oyBtHmdlU
eUIilf/xdyRThQkC+9zOsA==


--===============1981557714==--