From: marko.makela
Date: June 22 2010 10:43am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3112)
List-Archive: http://lists.mysql.com/commits/111749
Message-Id: <201006221043.o5MA2pq7021244@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1095019798=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjEwNDIzOS0wbHBi
dTcwdXM1MGphcWZzCgogMzExMiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIyCiAgICAgIGJ1Zl9m
bHVzaF9pbnNlcnRfaW5fZmx1c2hfcmJ0KCksIGJ1Zl9mbHVzaF92YWxpZGF0ZV9sb3coKToKICAg
ICAgU2lsZW5jZSBHQ0Mgd2FybmluZ3MgYWJvdXQgZGVyZWZlcmVuY2luZyBhIHR5cGUtcHVubmVk
IHBvaW50ZXIuCiAgICAgIEFwcHJvdmVkIGJ5IEppbW15IFlhbmcuCgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9idWYvYnVmMGZsdS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9i
dWYwZmx1LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjIxMDQyMzktMGxw
YnU3MHVzNTBqYXFmcworKysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjIxMDQzMTctNXhsM3N1d3AxaHFqdGQ4MApA
QCAtMTE0LDcgKzExNCw5IEBAIGJ1Zl9mbHVzaF9pbnNlcnRfaW5fZmx1c2hfcmJ0KAogCXBfbm9k
ZSA9IHJidF9wcmV2KGJ1Zl9wb29sLT5mbHVzaF9yYnQsIGNfbm9kZSk7CiAKIAlpZiAocF9ub2Rl
ICE9IE5VTEwpIHsKLQkJcHJldiA9ICpyYnRfdmFsdWUoYnVmX3BhZ2VfdCosIHBfbm9kZSk7CisJ
CWJ1Zl9wYWdlX3QqKgl2YWx1ZTsKKwkJdmFsdWUgPSByYnRfdmFsdWUoYnVmX3BhZ2VfdCosIHBf
bm9kZSk7CisJCXByZXYgPSAqdmFsdWU7CiAJCXV0X2EocHJldiAhPSBOVUxMKTsKIAl9CiAKQEAg
LTIwODgsMTMgKzIwOTAsMTMgQEAgYnVmX2ZsdXNoX3ZhbGlkYXRlX2xvdygKIAkJdXRfYShvbSA+
IDApOwogCiAJCWlmIChVTklWX0xJS0VMWV9OVUxMKGJ1Zl9wb29sLT5mbHVzaF9yYnQpKSB7Ci0J
CQlidWZfcGFnZV90KiBycGFnZTsKKwkJCWJ1Zl9wYWdlX3QqKiBwcnBhZ2U7CiAKIAkJCXV0X2Eo
cm5vZGUpOwotCQkJcnBhZ2UgPSAqcmJ0X3ZhbHVlKGJ1Zl9wYWdlX3QqLCBybm9kZSk7CisJCQlw
cnBhZ2UgPSByYnRfdmFsdWUoYnVmX3BhZ2VfdCosIHJub2RlKTsKIAotCQkJdXRfYShycGFnZSk7
Ci0JCQl1dF9hKHJwYWdlID09IGJwYWdlKTsKKwkJCXV0X2EoKnBycGFnZSk7CisJCQl1dF9hKCpw
cnBhZ2UgPT0gYnBhZ2UpOwogCQkJcm5vZGUgPSByYnRfbmV4dChidWZfcG9vbC0+Zmx1c2hfcmJ0
LCBybm9kZSk7CiAJCX0KIAoK

--===============1095019798==
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.5-innodb/
# testament_sha1: 42637d2aac6c210255d21bb6e413f6c9e38d0b1c
# timestamp: 2010-06-22 13:43:24 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   0lpbu70us50jaqfs
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTnRdlIAAcDflAAwUnf//3uS
CCC////wBAAIAFAD+T27RnXboNzTsJJEGiaNNMmTKYFPKehoT0QxMmTIDKaJNpppkNNUw1NAHqAA
aAAAkUBBE2mp6nop6aIyMmIaNDRoZDQcwCaYBMhgACYJgAAAkkQTCntUHoan6o9JoDQBk0AaeoDQ
202lXSbNWECO6APvxOzPZUyji92pI26eCEbKE4wjv4dGlto7+4K/mdjMOWmiU3yOhOk4y8/LuD+7
H9fLh3fmqH6hFbJ7uftmHkbHj3aMDzsMJgcwZFEZficqOPZ1jwqJQeR8IiZalq9hHotgolQvpRw9
adWq2Of4UiRt4cgifHtVT2EiDdcOZwhtAi9PGc4Q9YhF5HNLRLpg01dPZstndPtW5ZqCzWBa0N2c
9wjr11wQZ83yMl0QDyyhxcpwlbAXHYGfVVGwqaD17y4aUFeKGlcM9vBvyQFUPEZHBKxcgcgdbYol
k1hjoW5KEdba0NAq1CMBGuOCpipLFAtQYLbiukvN7jULNQK6xerQ4pWEBwXio2nOdaC/RjT1GQdQ
LTcqwwA2izOIgzDbpzLqtKEC+SCMyy2JXF5pgj4BAU4TRRBRZEzlpNLhjy1alFmmSgjRkoegsVzG
YbZ231niMlhrUltu0+bgnm1SyF5Dg667KBPPTGGVkKZBGJOCdXMsCsGxKc0JjwLjuY67iQx8Xx6t
3Kld+kRjMQMeff6RSovOR1eB6cHCsYdsUdUwj0uZMIQK/s4uWlA3+smpF3GI5ac8OlInreEGkBgi
Ij1si3emw+1fQjCkR4sVt12q1jp1l6biQ5Y79uZZV7o4xR/s8x3P6pMVLtajdMokXjIswkat925w
dqcCoIoka7SRPJxlxREnWPOYsN4nxqlvHwTG2q/wWwjlbP5E/J4+8aWIFvsi0kH209BbQQ5cZZy1
2OQHsGacw+/ZlvymvZmrbT01QidBtHq48kiyCyJlXZC5zraTDTeTIpgn4KZMouHVwwLt12smE5QK
i7Ke3DfKua1PKflM8yCTrX7rxmRjjzioF0RXkxNxyLW6PAsXy8+a4bgyZqMWKTq7dFk2cN4bnV4L
AVNKaIjCAXJGiIfoqwreJZqUhlSbeeqCxXqZDKjNI0iMl4HQOGzFWx1GdsJSJRkm999HIM5wJPjt
xCNMZRydo2m01r3pFU6dNQVA9sjxSOYLrlB6p6aIaHV8hWEakaoM8TKClPeeOiz+/iaJ3wSaL1zE
3EF6S14VJE0XX+qZZStUiKcuKVgqFJJrswUeee1aNtFhEv4wdp1O0mjuFhbjYF8pEN3QUNXgKNaa
MBtswdAOAaAhWhua0vNyEIAZUmbsjmL9QYDNdkTDYPpUYOybtlwo+YmVW2pXT3Wkv+K/T/i7kinC
hIHOi7KQ


--===============1095019798==--