From: marko.makela
Date: May 5 2010 12:11pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3068)
List-Archive: http://lists.mysql.com/commits/107516
Message-Id: <201005051211.o45CBZpD021686@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0675879318=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUxMTAzMTQtMjVmeXpv
OXNlMzE3OWN4MQoKIDMwNjggTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBNZXJnZSBm
cm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAz
NDUwCiAgICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTA1
MTEyNDExLXFnbm42YnV0a2EyMGRuN3AKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNTA1MTA0NDI1LTM5eTZxYmZmZ290cmhjazIKICAgICAgICBjb21taXR0ZXI6
IE1hcmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2gg
bmljazogNS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDogV2VkIDIwMTAtMDUtMDUgMTQ6MjQ6
MTEgKzAzMDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgcm93X21lcmdlX2Ryb3BfdGVtcF9p
bmRleGVzKCk6IExvYWQgdGhlIHRhYmxlIHZpYSB0aGUgZGljdGlvbmFyeSBjYWNoZS4KICAgICAg
ICAgIEFsbG93IG11bHRpcGxlIGluZGV4ZXMgdG8gYmUgZHJvcHBlZC4gKEJ1ZyAjNTMyNTYpCiAg
ICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBt
ZXJnZS5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2Uu
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmMJMjAxMC0wNS0wNCAxMDoy
MTozMyArMDAwMAorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2UuYwkyMDEwLTA1
LTA1IDEyOjExOjEzICswMDAwCkBAIC0yMTExLDcgKzIxMTEsNyBAQCByb3dfbWVyZ2VfZHJvcF90
ZW1wX2luZGV4ZXModm9pZCkKIAkJYnRyX3BjdXJfc3RvcmVfcG9zaXRpb24oJnBjdXIsICZtdHIp
OwogCQlidHJfcGN1cl9jb21taXRfc3BlY2lmeV9tdHIoJnBjdXIsICZtdHIpOwogCi0JCXRhYmxl
ID0gZGljdF9sb2FkX3RhYmxlX29uX2lkKHRhYmxlX2lkKTsKKwkJdGFibGUgPSBkaWN0X3RhYmxl
X2dldF9vbl9pZF9sb3codGFibGVfaWQpOwogCiAJCWlmICh0YWJsZSkgewogCQkJZGljdF9pbmRl
eF90KglpbmRleDsKCg==

--===============0675879318==
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.5-innodb/
# testament_sha1: f9e1e42ef48be9e4ce9dd305fdd22f32d8e9ee91
# timestamp: 2010-05-05 15:11:22 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   25fyzo9se3179cx1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdg55MsAAgpfgEAwW2v//3MG
AIC////wUAR2e2O2tWSnU9zl5CSSap4jJo02hMgmCY0hpBkAPUEkk0YUwaKM0aSbU2oGgMjRkNAJ
IggIMmk1P0IyBNPSMaQ9E0GQZVN6iaehNNGjTEaaGgDI0NA0AJJTTSnqfpJ6eUaEyD1MmI9QBiAZ
C949+GmWXHg3h2+803St6ZTw+7dXwvWIykzpM6oCOLO41c+AopHjlM9ZI1GGdmY5ea9o0ZdWqI2o
aTQ4xxGGye7W901HlnIWs9RT/v1TL0/c4M3qw9TnrZGB/JeGGvTzYlzlU7deJKblxuEXBF2ogRPs
+DKcROw/RyeFb15BKOVcrQWar7Vj7JdyaV6eKPZwJ8ndVHmLRegLuaFZkV9U/NFZXMT2O9mV+EkJ
kLcmfjeOurQUWRwIAoJFaslWOPEgUELiHdUtqtFmVE3dj34EMuLArYLJy7s0O+bq0TNQJi6pMRFG
lyeqKVDE1wPxTaQOFOM91KqfSZpRygMQOkhdhNbdQwJqiBksyC8E7QfYNK99uFqfaHFODf4JYG98
pOFC9mG6xygtxfZSu9R+ZnwVJkKDmFfKwbIOpWDjyjBUMo5h4mYnDMXuLlWedJ50Z09c5fXGwFQa
thG2fo0n7VbIisjaaFSjTon+BjYsTF6gcrVv5V6NKdl+JyIxrQsanVJmNZhri18bFR6y9Yqiw2Qo
ENhgZiorOiCY4F21dAytMp/BYKmXbFv+OXl621lWScaym4Yzp8hWEckWSZ4zDDci9hdrG7C64pIX
3u0ehiDdPec/GEnJweFxo2HuyR2SLmZm9vu9CWgLMHoDRlTtg4X9spXeeiKp+cTaMbdCrNpT5+Jg
hVnegOmXxEvK2CiD6oULDEPCGfGl7kqFJtcsNOVWkDiPOZxXQ2+0+YMz9Wok7cQYzLcYeJAmtBer
JK9eBE+Kjb5XwGhsZxLrfOJWjla9jcSOT4ndiGknTk0YHBULE8sU5cUc+78VOeDv00TM5OSWi8zn
JRXx5ufEiOd8ZFMDBP3yQq6azqkp4jSmRnjOXSCyoPa+NaSoRRNUIqIJ9jljiWi7TIYEhykOJavS
QwwqNr/x04mre4Jeaq63BgmYJOnnk/JpIa1nBodRNWxJOgKmgvFlpXJkqRxhtFXIHp9msGpvwXrk
c+CDjvDRQaCe7vFIWIwsU/hmQpBASZhCpwoQZAm1ZsEosLAV8lecZlCLpdJPAgvCDp3j+hBNgsp2
LLOW25YmQek02lODSmsd7pRG4VBMUGffLT3yXRWuvnzEWUmQyj1m9kLpVPwyx+om6ADEBexI/Ewv
2JOCZcHKum/dKmYH/OYhGn2LZs2KEZRIGJzrpZRuvrq7Cos2awmEG4L3pT1YNQyiaVGLUUJKpR1x
6tAN8I7fasqYqx8hWyUkSGbQvFbYsXkNUDoLru1iiKIuu5EB5U/gdn+3XfShZVgVmxjLmOU3+mq6
YMoNixFlmONPxrzfLlOfq2K913SIlACvi9ykSEyYvbZ9hQhPXU1y16TZHcOrZ/8XckU4UJDYOeTL


--===============0675879318==--