From: marko.makela
Date: June 23 2011 9:56am
Subject: bzr push into mysql-trunk branch (marko.makela:3231 to 3232)
List-Archive: http://lists.mysql.com/commits/139717
Message-Id: <201106230957.p5N9v4QZ029964@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0366970679=="

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

IDMyMzIgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yMyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiLWluZGV4LnRlc3QKIDMyMzEgVmFzaWwgRGltb3YJMjAxMS0wNi0yMwogICAg
ICBJbXBsZW1lbnQgV0wjNTcxMiBJbm5vREI6IHByZWxvYWQgYnVmZmVyIHBvb2wKICAgICAgCiAg
ICAgIEFsc28gaW1wbGVtZW50cyB0aGUgZmVhdHVyZSByZXF1ZXN0IGluOgogICAgICBCdWcjNTg4
MTkgcHJlbG9hZCBJbm5vREIgYnVmZmVyIHBvb2wgb3B0aW9uCiAgICAgIEJVRyAxMTc2NTgxNiAt
IDU4ODE5OiBQUkVMT0FEIElOTk9EQiBCVUZGRVIgUE9PTCBPUFRJT04KICAgICAgCiAgICAgIFRo
aXMgZmVhdHVyZSBpbXBsZW1lbnRzIHRoZSBwb3NzaWJpbGl0eSB0byBkdW1wIGFuZCByZXN0b3Jl
IHRoZSBjb250ZW50cwogICAgICBvZiB0aGUgSW5ub0RCIGJ1ZmZlciBwb29sKHMpIHRvL2Zyb20g
ZGlzay4gVGhlIG1haW4gb2JqZWN0aXZlIGlzIHRvCiAgICAgIHNob3J0ZW4gdGhlIHdhcm0gdXAg
dGltZXMgYWZ0ZXIgdGhlIHNlcnZlciBoYXMgYmVlbiByZXN0YXJ0ZWQgYnkgbG9hZGluZwogICAg
ICB0aGUgZGF0YSB0aGF0IGhhcyBiZWVuIGxvYWRlZCBiZWZvcmUgc2h1dGRvd24uCiAgICAgIAog
ICAgICBUaGlzIGZlYXR1cmUgY29uc2lzdHMgb2YgdHdvIHBhcnRzOgogICAgICAKICAgICAgPT0g
MS4gRHVtcGluZyB0aGUgYnVmZmVyIHBvb2wgb3IgcGFydCBvZiBpdCBvbiBkaXNrLiBPbmx5IHRh
Ymxlc3BhY2UgaWQKICAgICAgICAgYW5kIHBhZ2UgaWQgYXJlIHNhdmVkLiBQYWdlcyBjb250ZW50
IGlzIG5vdCBzYXZlZC4KICAgICAgCiAgICAgID09IDIuIExvYWRpbmcgdGhlIHBhZ2VzIGxpc3Rl
ZCBpbiBhIGR1bXAgaW50byB0aGUgYnVmZmVyIHBvb2wuCiAgICAgIAogICAgICBSZXZpZXdlZCBi
eToJSW5hYW0gUmFuYSAocmI6Ly82NjEpCiAgICAgIFRlc3RlZCBieToJTWljaGFlbCBJemlvdW10
Y2hlbmtvLCBWYXNpbCBEaW1vdiBhbmQgUEIyCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZmZlcl9wb29sX2xvYWQucmVzdWx0CiAgICAgIG15c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZmZlcl9wb29sX2xvYWQtbWFzdGVyLm9wdAog
ICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWZmZXJfcG9vbF9sb2FkLnRl
c3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2lubm9kYl9idWZmZXJfcG9vbF9k
dW1wX2F0X3NodXRkb3duX2Jhc2ljLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192
YXJzL3IvaW5ub2RiX2J1ZmZlcl9wb29sX2R1bXBfbm93X2Jhc2ljLnJlc3VsdAogICAgICBteXNx
bC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2RiX2J1ZmZlcl9wb29sX2ZpbGVuYW1lX2Jhc2lj
LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2RiX2J1ZmZlcl9w
b29sX2xvYWRfYWJvcnRfYmFzaWMucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3Zh
cnMvci9pbm5vZGJfYnVmZmVyX3Bvb2xfbG9hZF9hdF9zdGFydHVwX2Jhc2ljLnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2RiX2J1ZmZlcl9wb29sX2xvYWRfbm93
X2Jhc2ljLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3QvaW5ub2RiX2J1
ZmZlcl9wb29sX2R1bXBfYXRfc2h1dGRvd25fYmFzaWMudGVzdAogICAgICBteXNxbC10ZXN0L3N1
aXRlL3N5c192YXJzL3QvaW5ub2RiX2J1ZmZlcl9wb29sX2R1bXBfbm93X2Jhc2ljLnRlc3QKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9idWZmZXJfcG9vbF9maWxlbmFt
ZV9iYXNpYy50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvdC9pbm5vZGJfYnVm
ZmVyX3Bvb2xfbG9hZF9hYm9ydF9iYXNpYy50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lz
X3ZhcnMvdC9pbm5vZGJfYnVmZmVyX3Bvb2xfbG9hZF9hdF9zdGFydHVwX2Jhc2ljLnRlc3QKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9idWZmZXJfcG9vbF9sb2FkX25v
d19iYXNpYy50ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBkdW1wLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBkdW1wLmgKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL0NNYWtlTGlzdHMudHh0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVm
L2J1ZjByZWEuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmMKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwogICAgICBzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvYnVmMHJlYS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9zcnYwc3J2
LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3NydjBzdGFydC5oCiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS91dDB1dC5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3Ny
djBzcnYuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYwogICAgICBzdG9y
YWdlL2lubm9iYXNlL3RyeC90cngwc3lzLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS91dC91dDB1
dC5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1p
bmRleC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4
LnJlc3VsdAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNjIzMDY0ODQ4LWNkamw3
YzBrZzN6NGI4dm8KKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgu
cmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjIzMDk1MTQxLTM3OXl5
OWxrMm10NngzMHkKQEAgLTEwODYsNyArMTA4Niw4IEBAIERST1AgVEFCTEUgdDI7CiBEUk9QIFRB
QkxFIHQxOwogQ1JFQVRFIFRBQkxFIHQxIChhIElOVCwgYiBDSEFSKDEpKSBFTkdJTkU9SW5ub0RC
OwogSU5TRVJUIElOVE8gdDEgVkFMVUVTICgzLCdhJyksKDMsJ2InKSwoMSwnYycpLCgwLCdkJyks
KDEsJ2UnKTsKLUNSRUFURSBUQUJMRSB0MiBTRUxFQ1QgKiBGUk9NIHQxOworQ1JFQVRFIFRBQkxF
IHQyIChhIElOVCwgYiBDSEFSKDEpKSBFTkdJTkU9SW5ub0RCOworSU5TRVJUIElOVE8gdDIgU0VM
RUNUICogRlJPTSB0MTsKIEJFR0lOOwogU0VMRUNUICogRlJPTSB0MTsKIGEJYgoKPT09IG1vZGlm
aWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QnCi0t
LSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6dmFz
aWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDYyMzA2NDg0OC1jZGpsN2Mwa2czejRiOHZvCisrKyBi
L215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjMwOTUxNDEtMzc5eXk5bGsybXQ2eDMweQpAQCAtNTE5
LDcgKzUxOSw4IEBAIGNvbm5lY3QgKGIsbG9jYWxob3N0LHJvb3QsLCk7CiBjb25uZWN0aW9uIGE7
CiBDUkVBVEUgVEFCTEUgdDEgKGEgSU5ULCBiIENIQVIoMSkpIEVOR0lORT1Jbm5vREI7CiBJTlNF
UlQgSU5UTyB0MSBWQUxVRVMgKDMsJ2EnKSwoMywnYicpLCgxLCdjJyksKDAsJ2QnKSwoMSwnZScp
OwotQ1JFQVRFIFRBQkxFIHQyIFNFTEVDVCAqIEZST00gdDE7CitDUkVBVEUgVEFCTEUgdDIgKGEg
SU5ULCBiIENIQVIoMSkpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyB0MiBTRUxFQ1QgKiBG
Uk9NIHQxOwogY29ubmVjdGlvbiBiOwogQkVHSU47CiAjIFRoaXMgYWNxdWlyZXMgYSBNREwgbG9j
ayBvbiB0MSB1bnRpbCBjb21taXQuCgo=

--===============0366970679==
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/mysql-trunk/
# testament_sha1: c1746a42e8bf3eb3d94bf19c04c0ce915cfb720b
# timestamp: 2011-06-23 12:56:58 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: vasil.dimov@stripped\
#   cdjl7c0kg3z4b8vo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWduRqHgAB1HflECQWvf//3/n
3oS////4BAAIAGALz57Ku+s85dAAABnGu5wN7NdCASUorUNCCmI2qM00epPJoQ009Q0AAAND1PUy
AJKmVPKeCn5IxTNEeoBoGgaAAAAAHGTJoYjE0YBGAmEAYCaaNMjQDCRFJ6mhT9Iyek0nqMh6R6ho
9T1GjQ9T1MgyGj1NAIpFMCaJ6Jgqf6p6pvKejUZDapj1R6nqYQ0DQDQJIghoBMmhMTKNT2op6nig
AB6QeoAyChVrvkffkoKe8gQwDl0V6hU4zL6C7LnYcdGNbwpDBC5KbVSkadZxOWhYOCK6/7wQp1ES
+EYU4XYUmo1Ssm1kpqNUuIogxR3t2+13uNav1L36i+iMUMDDIGTL1XSkV3AuVg4xuWNmigZbMdCk
WwslUN2u82rRDMOrhaywdg1A4IGGHfofXF6jFSzJcCib8T29AmDJc6RA8JL5yhxfaxql+UqbENIR
rNaithKMEvS8l7kEkcZKpj18GGxvfviqw1SzA6SKpyuNqZQYr59FlOkez93QK9ffFFaZbu7tgHgt
WYYZsEdGWI8w6HAcYuIM4MbF3emBpvly8fKx2YdF7ertzcmKdggsssq1/2glLEeXqyAZwNAE9EZX
6jArs3i00+eIGY4LL9tzASbxg1pJ7gEzwmJj2Cp4FwkHMDUd6Of4HWJrcQQBCPnznQTrTlMhZFl3
QkCWtOEYTE6qratbPeppiRedFIhRihAKxW6Z9AAexC5te9yZG84r8XoiCIhZPNOm15K0BMQobaC1
ZqoU9ulUb4ZSAo8wymmjLoUCSSR5APRggiSE08Cy2VhQrRiVWzN95OF+mF4HURNIyC9xAMrD2JD5
pDsNErSwckQF4RJGcCz6Mq1wtKFxYE8ZGWZTcWNbXXvAmWvgjuMgmPQpK6+4sihCcY4yYuRTeJPi
wckwfpuBwjRkJGBQL2O4te++avuwuuYSRtwveRtedTHJz1KBSQyXBtRDY+BllyOKHChuUYKlGGZc
XVZFAV3AR7zUYYzRkZ/JaLcBffpXdA2mZ/aBfrkIi2FfEav41mh7rDgkFnEOmJGV9yXwVBOBfIq2
OUCZYdys866w8tDYvEbq6dB2MXymjHTjVqF8CEBJFyJRZKsa2uDM8sQIPEtgWSELQ5EcJvUU5hnt
hGxiYTQqIVIZXccLmWAy9lVQEuMr99tiF9AFqHUgWS/CDFbdxEtM4jttGDcTaGMZl0VBMki8NBE9
yiT00MZHQcjyOpcFd1t88kiJFXGs6olwxAce0EyrqAzEWUmTvKAYjk1iqsBjDyJcw6/kVUWo74FH
oXIUoE2S8hhXsIxrYcCorrh24Wa+pumqFt8SEdNtbaSL4eduKYPJTr4Fl0JvIXHVAydA5qf9WwGM
y4sYLg3IpCeenYsamp9z1mRkXE3yEQEUvkqp3QCOIL2BgtxZBL5aDGxbE6tCp9QMg8Q34XXiWhV7
96KCOGuh38+BADiczJoZHMcHhPDzC9IyPmFZOIdPOwyikBSDrA3hLPOGJYUyAsHk0q9lyEXFxfMD
mdUQ0IgoyPgRPK09ZnmIxnZTe8IMkO4R23JEiGj2E5lvpJBtwaw07Fpd0kELopGCxAhiDGzjFZvM
mxEapcFMFhWVQitDznKu1s7zNC+9kJkLJyJOT5jRd2eVrWLEBgkc+wG4rrztcqRaYF3bTfKZLBMN
bcWsPIYZmLMi/dEoTIEVTVTcqLelRUQLGbb2HYwXP0DflvwoYo1A4g6Fg3fSwYKh3ceZUVE+EgKk
Kg7pJuXXfdHNwZmvOVUyhaxxXjJ1fQugi4xiShuqv3HBGoj2BSJsq4/t0XZWFlBkIIdYGRm5XU3L
KsMYs2aFNdTiBhnNlShYjXQwzcVHONZkl6h1wweFTwcQRANN6pkIIacDA2LhWoXgW4BS8kdxJ61C
BRt6Pcus7LFix9Z2kQDYMTY3B1K5cNTKDlPODvrnW1dCwStxUTGHfAvxADGBdC3/J4UJkwZj+Kz7
LJR+qaiY/2EVk4sx1HrqYp7VWdlFujoqySVdUGCb27zcWUM64QgY0L365Bd5KEPl1HS7HDuygoCA
WIY05jGBkMhdXBKQxo5QArJnP3XOg1eGXmfHSINhnjKcgjZg0oxzM0AB76MN0VXjmaJqQ4S1hozC
nMuAD56tB9j8SgKvoboJ+Ov4syIEULURKBiXcodt1fP9wyHGEQO50LD85bvPaYFyuV5UelkCJICr
M0UKHhCuVEifA2PcJEz3MHfADfjwXA0NDM4VNoagaMN67wKFi2A4jXmBIDkqcmVp3PrCJiWe3euT
AMJUCjr1cQK4OKAXVc/QRUjVKg2wz8TWNdfqomkytC2oqCN1pQFrjbNWFaStIZoXGBQvNAHhRKUB
SPv0GboKGhCnAcI0kF5WrLnMTK1W6fazBCMFl7lUMQIFzBbV4CQgAUhgpRjt+FM7ng58idjqFn22
u1o7tE8ix+sSjFhmETwT7cg6i9RcLwvGD1TOcBaIXgodYl+RTYZW7uZVmRh9iFidSh8/vqErbVhw
vu5SwU52dQ2Z7w0F3OdCp5ddqfBN8pgnAByGPIS8EAfi4jkgYF56fRuASOcO/VfPnf+ARJ4dl4FX
a33hNWGSJcj5TErnMKXiFdp0lVgHtDwVavDp7TyI+hbIjHtMYfMsPgcao2m4Dvn3JG8iZIJldZqg
3fcL4ivFXUHjCKPgv6BR1A6zPHqnPPBAZ2FfQRHoj+Z8hr0tO1GZeiG9BBb8iSVTiXzmBaftcQX6
nJJe1C5FoXv133+B/y+iH6HqSp/VWHG6cEPdaZXyCG4WNhgarVsbc8BuRyI6vVPPeG4gqgkZjnud
za5Q0MQD3AWmHJXoxGmjud19g6O3Yj6w2NQmAW8NhBYJHCe0AP7PQ70aaNogVI1rkB7HiDpChHpV
lS4ntYQ2JAAY+NgxJAZAzJ4iavDNxEmeEw3vlcRtkuRn5LntFSuSNocjE9f1oBC+k7WCQwSCGXYY
LYZekuHLU7pDxcj9RNsCpqQ5CXlk9AEpU2Ffwskk/nAhRUNNItKOWEXipORY+azmo1BJCr9EAz0Q
MwhmBO6D3cuo03AD4roSiHcPq6Fh8LTLiEeRWCFgGDAHc5KUsafhl8dBqgf4QHGjQvKSHs9fTCNf
j2Z1nnAk+gc25gbpAyxIdbrCt+kOrA2o29m/oX334K1HNHxMAdGobgXxEUD7ArdjcxoQHFGeA3hg
flQKtfcph3iaXRfo1sxvFI9I4nkzQvPXtn87LBAvWM86tEnrAtAw6gwm280bWaggd/aMzugxLPKN
YSUQwUg/ZpLcOYMJhsxrrblZjjc0BEBEbTzEHQDTcOyADNcjIYxneUm9KvPoI8VVvmigoYIIE+WU
odL3iQnWG/tExuNGofwBqMbRNg1McF8QFIPQ17tGJalb0UOAu5IauJgJOgwGhcU30kCgtj3EUurC
9Hy7Ec7lL4DHnrZ9Ok2UVnUnUE3W55BbjQg3quJZEK+lqBJYYiaNCvP1RDSogQERtOTArYmEMUHA
Mgk92b3pSWGmjgLYHgJicDek9t+hfSBMNTgzWA5F/+Cs7D/F3JFOFCQ25GoeAA==


--===============0366970679==--