From: marko.makela
Date: June 8 2010 12:13pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3502 to 3504) Bug#54009
List-Archive: http://lists.mysql.com/commits/110485
X-Bug: 54009
Message-Id: <201006081213.o58BsZWW031541@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0068215886=="

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

IDM1MDQgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wOAogICAgICBEb2N1bWVudCBCdWcjNTQwMDkg
aW4gdGhlIElubm9EQiBQbHVnaW4gQ2hhbmdlTG9nLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9y
YWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAzNTAzIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYt
MDgKICAgICAgQnVnIzU0MDA5OiBTZXJ2ZXIgY3Jhc2hlcyB3aGVuIGRhdGEgaXMgc2VsZWN0ZWQg
ZnJvbSBub24gYmFja2VkIHVwIHRhYmxlCiAgICAgIGZvciBJbm5vREIgcGx1Z2luCiAgICAgIAog
ICAgICBkaWN0X2xvYWRfdGFibGUoKTogUGFzcyB0aGUgY29ycmVjdCB0YWJsZXNwYWNlIGZsYWdz
IHRvCiAgICAgIGZpbF9vcGVuX3NpbmdsZV90YWJsZV90YWJsZXNwYWNlKCkuIEZvciBST1dfRk9S
TUFUPUNPTVBBQ1QgYW5kIFJFRFVOREFOVCwKICAgICAgdGhlIHRhYmxlc3BhY2UgZmxhZ3MgYXJl
IDAuIFRoZSB0YWJsZSBmbGFncyB3b3VsZCBiZSAwIG9yIERJQ1RfVEZfQ09NUEFDVC4KCiAgICBt
b2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBsb2FkLmMKIDM1
MDIgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wOAogICAgICBidWZfcGFnZV9nZXRfZ2VuKCk6IFBh
c3MgZmlsZSxsaW5lIHRvIHJ3X2xvY2tfeF9sb2NrKCkuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1Zi5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
Q2hhbmdlTG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjA4MTE0MDU1LTdi
MDR5dHVxejBsZGU2djEKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODEyMTIxNS00bWJpc3UzZnlrM3JldXlx
CkBAIC0xLDMgKzEsOSBAQAorMjAxMC0wNi0wOAlUaGUgSW5ub0RCIFRlYW0KKworCSogZGljdC9k
aWN0MGxvYWQuYzoKKwlGaXggQnVnIzU0MDA5IFNlcnZlciBjcmFzaGVzIHdoZW4gZGF0YSBpcyBz
ZWxlY3RlZCBmcm9tIG5vbiBiYWNrZWQKKwl1cCB0YWJsZSBmb3IgSW5ub0RCIHBsdWdpbgorCiAy
MDEwLTA2LTAyCVRoZSBJbm5vREIgVGVhbQogCiAJKiBpbmNsdWRlL2RiMGVyci5oLCBpbmNsdWRl
L2xvY2swbG9jay5oLCBpbmNsdWRlL3JvdzBteXNxbC5oLAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwbG9hZC5jJwotLS0gYS9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vZGljdC9kaWN0MGxvYWQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMDYwODExNDA1NS03YjA0eXR1cXowbGRlNnYxCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9kaWN0L2RpY3QwbG9hZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjA4
MTIxMjE1LTRtYmlzdTNmeWszcmV1eXEKQEAgLTk3Myw2ICs5NzMsNyBAQCBlcnJfZXhpdDoKIAkJ
CS8qIFRyeSB0byBvcGVuIHRoZSB0YWJsZXNwYWNlICovCiAJCQlpZiAoIWZpbF9vcGVuX3Npbmds
ZV90YWJsZV90YWJsZXNwYWNlKAogCQkJCSAgICBUUlVFLCBzcGFjZSwKKwkJCQkgICAgZmxhZ3Mg
PT0gRElDVF9URl9DT01QQUNUID8gMCA6CiAJCQkJICAgIGZsYWdzICYgfih+MCA8PCBESUNUX1RG
X0JJVFMpLCBuYW1lKSkgewogCQkJCS8qIFdlIGZhaWxlZCB0byBmaW5kIGEgc2Vuc2libGUKIAkJ
CQl0YWJsZXNwYWNlIGZpbGUgKi8KCg==

--===============0068215886==
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: 912001ca8fd7ebf03e3ee94d41426e982d1a8d2d
# timestamp: 2010-06-08 15:13:36 +0300
# base_revision_id: marko.makela@stripped\
#   7b04ytuqz0lde6v1
# 
# Begin bundle
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
hjO8/xdyRThQkIbbPCc=


--===============0068215886==--