From: marko.makela
Date: February 2 2011 12:10pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3698) Bug#55284
List-Archive: http://lists.mysql.com/commits/130212
X-Bug: 55284
Message-Id: <201102021210.p12BcrZX025654@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0573635894=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIwMjEyMDUxMi14YXl2
NDlsbzUwanNiang3CgogMzY5OCBNYXJrbyBNw6RrZWzDpAkyMDExLTAyLTAyCiAgICAgIEJ1ZyAj
NTUyODQgZGlhZ25vc3RpY3M6IFdoZW4gVU5JVl9ERUJVRywgZG8gbm90IHRvbGVyYXRlIGdhcmJh
Z2UgaW4KICAgICAgQW50ZWxvcGUgZmlsZXMgaW4gYnRyX2NoZWNrX2Jsb2JfZmlsX3BhZ2VfdHlw
ZSgpLiBVbmZvcnR1bmF0ZWx5LCB3ZQogICAgICBtdXN0IGtlZXAgdGhlIGNoZWNrIGluIHByb2R1
Y3Rpb24gYnVpbGRzLCBiZWNhdXNlIElubm9EQiB3cm90ZQogICAgICB1bmluaXRpYWxpemVkIGdh
cmJhZ2UgdG8gRklMX1BBR0VfVFlQRSB1bnRpbCBmYWlybHkgcmVjZW50bHkgKDUuMS54KS4KICAg
ICAgCiAgICAgIHJiOi8vNTQ2IGFwcHJvdmVkIGJ5IEppbW15IFlhbmcKCiAgICBtb2RpZmllZDoK
ICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jJwotLS0gYS9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDIwMjEyMDUxMi14YXl2NDlsbzUwanNiang3CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjAyMTIx
MDEyLWJxcHE3MTJydzE2OXprYjMKQEAgLTQxNjksNiArNDE2OSw3IEBAIGJ0cl9jaGVja19ibG9i
X2ZpbF9wYWdlX3R5cGUoCiAJaWYgKFVOSVZfVU5MSUtFTFkodHlwZSAhPSBGSUxfUEFHRV9UWVBF
X0JMT0IpKSB7CiAJCXVsaW50CWZsYWdzID0gZmlsX3NwYWNlX2dldF9mbGFncyhzcGFjZV9pZCk7
CiAKKyNpZm5kZWYgVU5JVl9ERUJVRyAvKiBJbXByb3ZlIGRlYnVnIHRlc3QgY292ZXJhZ2UgKi8K
IAkJaWYgKFVOSVZfTElLRUxZCiAJCSAgICAoKGZsYWdzICYgRElDVF9URl9GT1JNQVRfTUFTSykg
PT0gRElDVF9URl9GT1JNQVRfNTEpKSB7CiAJCQkvKiBPbGQgdmVyc2lvbnMgb2YgSW5ub0RCIGRp
ZCBub3QgaW5pdGlhbGl6ZQpAQCAtNDE3Nyw2ICs0MTc4LDcgQEAgYnRyX2NoZWNrX2Jsb2JfZmls
X3BhZ2VfdHlwZSgKIAkJCWEgQkxPQiBwYWdlIHRoYXQgaXMgaW4gQW50ZWxvcGUgZm9ybWF0Liov
CiAJCQlyZXR1cm47CiAJCX0KKyNlbmRpZiAvKiAhVU5JVl9ERUJVRyAqLwogCiAJCXV0X3ByaW50
X3RpbWVzdGFtcChzdGRlcnIpOwogCQlmcHJpbnRmKHN0ZGVyciwKCg==

--===============0573635894==
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: 00b1123da17c454a421cb27b000dc2ba0e8824b9
# timestamp: 2011-02-02 14:10:20 +0200
# base_revision_id: marko.makela@stripped\
#   xayv49lo50jsbjx7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQDV7cwAAb/flAAQenf/93e3
R6C////wBAAIAFAEF28dD06O1h0VDRJD0TGoYho0AAaAAaADQAZEk2o2qb1PVP0TammpoBoAA00a
ZAAA0INJkR6mo8ppk0PUAAyAGIAAIqeJqHqNHpqMTIGnqAMmQ0aZMjTQACSRNDQTTTENE02kU80B
Ee0oaZD1HpPU8ojjeE1ddQlVSgGqUXaxAu2NDLJlzIxa8/22bh70lHIiIUcgDuoY4wGJIwIRP1tB
1iLWGshV8ZQlMgV4s5AnMOoIXhRd+ZGhphAgMeGV86s15ysG6cDuQggyTZDxJCpAtfMeESBS6tfT
kvuI/tda6xVrfzT+tEq7juNj8FgkdKRHsLzjzan580XpTtSkc6el6tFkEiD8tLlgoEO0Zhk1q0Pn
Vy1Vh4zuHUOh3nbWLCkRm4d51eNohz3IKVxoQUVXGpLXBWPFCRUcr63X978BzFwEktnfiD0KCvDG
YEJtESoHoGQWbNMxtxipytg1b25Il3G3omFiYAykYeVv3mBJEmemNhRC+9dlVm/rwJ1fGqXUiA8y
rNStcX7fdTmk2rBPuwi1ndiqtCzOnNvn0Bz3NOp0ZrbiVQKbMJtcryaWMmmefcna5K61KLM9YGMi
qe4/0TZPUSreV06RMCiAqqJBi544EFUJFsElq2W3Yry35iiaYSkPpTTa31QdEnLiQ0bpk8XCyMmo
KmaeaxoXIqeTOTTNAnCadrF8jDhnvKXdr+nLxrWKR6VftQOZmbkGPV7JKSTpcZIeC48u5SS6NolE
16O4XSSSSOM/JRvRaMFifXMCGH94Ene8Os4nWpJ0j4+taRHxHZitwQ5eXYkOLbZeajV2f0Uo9qUK
eh3l5rJy46zai8b54kKfBjkeS5Xz7Fx8xd3gjlNkx+fJDGCrOdYKboVi+Hv5umq3hLIzkitItlhe
qLS6FS4GwY8zlJjhlWbRTgbHGWM2wuV1A8su/Tx6btE8oIWAKcFjiOq5CHBifxYaNQ5iFKIToFXV
g6zbmr13TYvs38koUJN8qGkiISGmIhEqW343rlNtqv2cTUcApVjnGy4yN23LYp7pDdScfb8Ikm5x
xc3EedKCRqTEMJnnvQEhZg7UUO450zoLnddnYHHvaHAK6aPTDRCNwX5BHdJvNi6liSpjoFbQke+s
MQXNtCsK3A9khihIY7miaNm9Z5431PKEjwSNIeh8hnYzLM+w1xdJIfS17hSamYFtdDQNp72Z3bKt
MpJjHRKI0qgDzIypsu3jSK9aqZryXaCijfJK3qkShSvBnKJDBijNp0ZYuZPJvu1V/fd6ikjGL0uA
pc6imVag6lIewSu3TFDIoe8kzQBaZ1GiDcmJoEF8xOT9jXQ6vhSW5zJq8wNAoqFOSkL8gzDmangH
OaxqR1CyGx96GOEhWkA4BC1kmgpXKZ1tp9JjdZjMqqq1Zs3K0zpsAiKJ2YrFQWnBKDAYnUBYXGCh
/Bc/+LuSKcKEgAavbmA=


--===============0573635894==--