From: marko.makela
Date: January 20 2011 10:33pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3446 to 3447)
List-Archive: http://lists.mysql.com/commits/129302
Message-Id: <201101202233.p0KMQRai016670@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0660181835=="

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

IDM0NDcgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yMQogICAgICBNb3ZlIGEgbWlzcGxhY2VkIGRl
YnVnIGFzc2VydGlvbiB0byB0aGUgY29ycmVjdCBmdW5jdGlvbi4KICAgICAgVGhpcyBtaXN0YWtl
IHdhcyBpbnRyb2R1Y2VkIGluIGJ6ciByZXZpc2lvbiBpZAogICAgICBtYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDEyMDE0MTUyNC1teW5weGcwdzBjZDlvaWhnLgoKICAgIG1vZGlmaWVkOgog
ICAgICBzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMKIDM0NDYgTWFya28gTcOka2Vs
w6QJMjAxMS0wMS0yMAogICAgICBBZGQgc29tZSBkZWJ1ZyBhc3NlcnRpb25zIGFuZCBjb3JyZWN0
IHNvbWUgY29tbWVudHMuCiAgICAgIFRoaXMgaXMgcGFydCBvZiB0aGUgV0wjNTQ1OCBjbGVhbi11
cC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xvY2swbG9j
ay5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYwogICAgICBzdG9yYWdl
L2lubm9iYXNlL3RyeC90cngwdHJ4LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvbG9jay9sb2NrMGxvY2suYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9j
ay5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTIwMTQxNTI0LW15bnB4ZzB3
MGNkOW9paGcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTIwMjIzMjM4LWZoa2kwYmwxYmQ4YWFwb2EKQEAg
LTYxOTcsNiArNjE5Nyw4IEBAIGxvY2tfdW5sb2NrX3RhYmxlX2F1dG9pbmMoCiAJdHJ4X3QqCXRy
eCkJLyohPCBpbi9vdXQ6IHRyYW5zYWN0aW9uICovCiB7CiAJdXRfYWQoIWxvY2tfbXV0ZXhfb3du
KCkpOworCXV0X2FkKCF0cnhfbXV0ZXhfb3duKHRyeCkpOworCiAJLyogVGhpcyBmdW5jdGlvbiBp
cyBpbnZva2VkIGZvciBhIHJ1bm5pbmcgdHJhbnNhY3Rpb24gYnkgdGhlCiAJdGhyZWFkIHRoYXQg
aXMgc2VydmluZyB0aGUgdHJhbnNhY3Rpb24uIFRoZXJlZm9yZSBpdCBpcyBub3QKIAluZWNlc3Nh
cnkgdG8gaG9sZCB0cngtPm11dGV4IGhlcmUuICovCkBAIC02MzM2LDcgKzYzMzgsNiBAQCBsb2Nr
X3RhYmxlX2xvY2tzX2NoZWNrKAogCiAJdXRfYSh0YWJsZSAhPSBOVUxMKTsKIAl1dF9hZChsb2Nr
X211dGV4X293bigpKTsKLQl1dF9hZCghdHJ4X211dGV4X293bih0cngpKTsKIAogCXJ3X2xvY2tf
c19sb2NrKCZ0cnhfc3lzLT5sb2NrKTsKIAoK

--===============0660181835==
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.6-innodb/
# testament_sha1: f6168103931f235439db7170d485592b14857cf5
# timestamp: 2011-01-21 00:33:28 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   mynpxg0w0cd9oihg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY/bvTYAAZNflAAwcmP//1MC
BAC/79/wBAAIAFADeVNosaN7VuhJJJ6aATU9MmT0km9I0yT1NBiMamGSlPYmARqPUnlGgAANAGgY
k0FMp6aeo00p6NNQPaiYNA0BDDQ0AAAGgAAAABJSmg09IDQD1Mj1AAAGmQV2N+11x/nBR1Hbow1W
F0RLY0GhDKFNNuZJHj3D0eQ6XgeZJ3h9V7e+xs64/N0Yjliq8kkBbKz8/3AXaLZdZDIuivuo2fO/
0X9SPVRUqCG3f5I9ov2Qw7FeCzyBbb56Je1zcgN6rkQecuAWJG2dalxHMkUWH6B+SNYnHor1ejC0
JW7oJHnGb/F1k6Q6RwlK1GBTOZJ6Nv8PejAWFHonXMdOVmKwNbLZUK+WMMkiCRYTkbWLwzB8AdhE
wqEEL6IBluTcRESEuFFaQWaArpIaXTtMga3xoWG+RkRFzVEMpi1h0ZDPQViNYzYlhfLKC2ENWH0z
A2YM0kcIZypgQsLOFoOsHBSYIJVFjShrZpljLg0x1m+eQ1IbmNjEz1IFFZcCljUtrgpuDrgWuVdE
JU1vurQCD1IHhTwiELfiQsQxsinEUgJsVNRFAJ0V56u8aurZeOZuEN2/rznAAztQSXozk3Fb6x9T
B9zz6POhMykCJSXLIaMYxzBZi6u5+IL4vgW8L5QvzBccpNW9KpHvAF5xcuNQbjHiYrF+4XhmLTKv
y4IYmU9S8gr5rXpYrEbfkgRz1dqBzgMwDXKrF3Fc67cSthvKKBsNZCjHvM4CMek12hrR18eP5nch
N+icYieO/n39m7kzqZwrp5YrQ8NHQbf27Ku9rvZxtQqzFMteF/DNs8iCHg6CqK9JLlbuDEpNBfHf
wxY8BuP26IaphgakwC+atHXWKtRFKZ5Ftt34SlrGRFpgJCwC2fJ8dEa0SR1byNxhwxGkogbCD7Qi
vhgQsIaRNBsAA90QJhFck+rMmHhrZAW0FNiHoQGduuVclhEype8w3ogPP2yJobHhqaWRUnTIjRAM
TE9+dgJwsSCGM5IyoVdLfTJgTQpUtEit9cMcMWZOH92Ip9styNVuCmANLnoqm7XELIkGh0CF0IhO
QjHCF8bGQ25pEKRyhOjNMiGFW03dogEdfMZoyeTwj1OAeQo9m9l5nQa8wot35yadRGRF70D/ghFj
MjTnD3fYw3f8XckU4UJCP2702A==


--===============0660181835==--