From: marko.makela
Date: November 2 2010 7:42am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3303 to 3304)
List-Archive: http://lists.mysql.com/commits/122574
Message-Id: <201011020743.oA27fMb2030138@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0694499777=="

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

IDMzMDQgTWFya28gTcOka2Vsw6QJMjAxMC0xMS0wMiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMKIDMzMDMgTWFya28gTcOka2Vsw6QJMjAxMC0x
MS0wMSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmst
aW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3Vy
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYycKLS0t
IGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAxMTAxMDg1MTMxLXpkMTl2dDY2b2U4MDB3YnoKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTAy
MDczODMzLXM3ZW9nMGs5OTZodWlybjIKQEAgLTEwNCw2ICsxMDQsMTggQEAgcm93X3NlbF9zZWNf
cmVjX2lzX2Zvcl9ibG9iKAogCXVsaW50CWxlbjsKIAlieXRlCWJ1ZltESUNUX01BWF9JTkRFWF9D
T0xfTEVOXTsKIAorCXV0X2EoY2x1c3RfbGVuID49IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJWkUp
OworCisJaWYgKFVOSVZfVU5MSUtFTFkKKwkgICAgKCFtZW1jbXAoY2x1c3RfZmllbGQgKyBjbHVz
dF9sZW4gLSBCVFJfRVhURVJOX0ZJRUxEX1JFRl9TSVpFLAorCQkgICAgIGZpZWxkX3JlZl96ZXJv
LCBCVFJfRVhURVJOX0ZJRUxEX1JFRl9TSVpFKSkpIHsKKwkJLyogVGhlIGV4dGVybmFsbHkgc3Rv
cmVkIGZpZWxkIHdhcyBub3Qgd3JpdHRlbiB5ZXQuCisJCVRoaXMgcmVjb3JkIHNob3VsZCBvbmx5
IGJlIHNlZW4gYnkKKwkJcmVjdl9yZWNvdmVyeV9yb2xsYmFja19hY3RpdmUoKSBvciBhbnkKKwkJ
VFJYX0lTT19SRUFEX1VOQ09NTUlUVEVEIHRyYW5zYWN0aW9ucy4gKi8KKwkJcmV0dXJuKEZBTFNF
KTsKKwl9CisKIAlsZW4gPSBidHJfY29weV9leHRlcm5hbGx5X3N0b3JlZF9maWVsZF9wcmVmaXgo
YnVmLCBzaXplb2YgYnVmLAogCQkJCQkJICAgICAgemlwX3NpemUsCiAJCQkJCQkgICAgICBjbHVz
dF9maWVsZCwgY2x1c3RfbGVuKTsKCg==

--===============0694499777==
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.6-innodb/
# testament_sha1: a158dc766fd84796fe0bd1690c9af75da1ad4cde
# timestamp: 2010-11-02 09:43:48 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   zd19vt66oe800wbz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW+yOo0AB8hflGAwen///38v
3/C////6BAAIAGANZ1H3Lvs9sXsXoMpVUli73HFMj0HXe1Te9t67cg9BWEihJk0yJP0U8UeEm01N
HqeSANGmaQaHqaAGgJRNDUyA0FU9tVPBIaAaDQaBkAAAAOMjTJiaDJkwmmQMhoDQGmTQwAmgMJJp
QJkjTE9RkNPUQDTRpoNAABoABoEUip4U2mqbUx5U81INqPSHqaep6hiDQAAaBoAkkCaBomRkmRNo
0IZMKeqaA0AaAAHqJEkpNsTvuAxl3+fux3/Ta6MQb8YXO58nu66lDPm4aeIPdDN7KN1pF3q6fyfK
B+iYvyd3v6zCOyf67JkEYOUHs48FF4aJvkRZWxD8DEv1j1yKXkrZjNymbAoi6iymD8zBv0WmV5dP
ELiLDH9Md3F+rVNzYiWZWidwExpsbcCp+4lpmgIpBrbhxrQstdOmhmnZblTBEVRZDrYyRhTDqbln
QGO88PN06P6jDUTvWQW60WBo8u3slvPfdV4sDIreqy44t7qWxTmevU8OXNEFV7dFz4ZdFXjkujk1
99tc3vi1o58XI3tClQOe1Uj4PT+dI6bJkDmhz8oUTWbDNQZKbW8pX+GptihQziStJAkX8uM0qTEK
YI+M20XSMoYxL/6ay4n8mHU1zctrsssTKPl9Txc9ZQ+YmHn/V3BT19Xe0n7/e3yQiVU6oIC3wYXE
O5BQWQOWGvty4cme+Sw5bpX2fJFVYciMrBt+6FzRE5fNbI6HN9eHFzYivPwI8Zo/poUHBHS8SPhv
a4RgTeDqhc85uHSdJePYGCPxiiegc6d9YLARJQp37/i4dvm2xa0teEWsEXpmSBeeh1CBarL27PPj
9G8+tE53ObG229NeXY5LBLcgCmXEMgZCJz3tE0ZpKgpYYIFGSC91GHkpkKGeDZgcRGWZnniEXjKT
IX0dAhyZ0yXaUEi5gCkkFREEz4PRAGBVuQWsxIyBWvseXhINyhihcOQvMFoImtEW4OQM9mHJZsF0
bDsf9qzmTUz3B4iQwCnmgkKEFzDuFJjhmOYOuBbh5ApyVAiF3WPyYo4MFQdBNomWYR6aZ7YsYRgG
RQfkdaypmo7SwkPJWIXiKe8MgwMmInEwc0D9yFht3bSJs6GMm9G1IQfczluyTwM0PchdZ1kMtIyW
e0rMH8YwOBbWC+zx4rO+vmYQe/BjDIq0DavfrQhWCIHM6uFDEqzv4zsMpTo8aBduPIlDwCFkiisI
gpVEQTIOsLcJIWWQlWrqa96SLUjEMyHSvKl3dbU6b1sQgVonGubOJOUSAS3/xrFbubiR2rQYTvWA
hUxKxHVWxlcYLtPoTTPffhBO8tUSmglctY4ZhEFQGVeCJaOlMHtJ74VKWHTGZiIWtEDkFQvUydRk
tccBDZhzBcpEOqYxwbGtOHamJkoTHwOK7gi5ORHfPIuSeO7UDFQigbKTYRbccUKzEzytzuI80iV2
deDN9Se4R0KmQwxKuI2fN6xrNakz9QWFMz732BWPNaXOiC1+LMN76MQMKOWgGms70EaBqZD56gJc
HVd0SVTAv52zQVZBdWEgXCVKrGvwdKDsY9ENiri2uTk17Si3UbLMtKGGcSzpdlwOacbkLYYmqyuu
cG7dCPEJCNatNWLEJoYlfYsLIXxXVE950ZKJGq5BaOkhYnrBIkavacxIihauyGAIyuIi2KVhpZJC
fuo8cw1xAjQiVnAvKl21BTgJIJAiX5XVlkPxlz4xMiKqKItEUwL1QHp9d0lRCZPBOdC1RHoXYhTi
9yydyUIZqTITiUjcJGQxFgTBJQMWSZnKUgtFDGP0ERRqGwxOnArCm4NxsoRYmT8zQzIF2UDIbHbh
AzQqxFZWRHlt4YSCyug96FVPTVz6U23qTHXTBEhtOFXkUHK9wjscAU31qamrKX0vhBNtpBmCaKF+
sWcIhAVLBAmGIQhMJOAsQggiDkJgmDSQViU6wYK0HueSDQOjgCxVWANQB6osbbcUzSGtFHjDAG8g
48Z4LigALkRut/Y2+kN7ADBgxDbcynaXH1FCixkrYWEY9QMXeCPq+qm6+lm3oRetTSTZJXVH7QCB
9V+zgDlgr0bYJB/gzV9T0bb1kieFoRyHR2LMrT8reNAcxzruM8F6FZOyA2g5ybek9uoplZaicWSx
FnQqdrmWJEzeyG8kGONDdVWfXVd2oqUrEq8MymxqHX3+Tp9vsz8kiOyZT8s8JLniRTWoIFuIlBfH
bHVQW6qOOVyquelVCISVqqbny+vPvc0fPWINkSKFzxLJ169Hlo85z2GAQKXMdO3b2uhU4TdRfg84
kLN2t/BjL85GGprsGUDg/UwKIvBqCXFfcfnEC/bUX+zB3A8csHo3g/laBI9mO6AEH4sYCR+QKCBd
0Gk59SYPbnF4c3O0EN+CJwxQnHbyOse3c+vcCzj2ngdWgLdOghXPYUFSSrODCUhCu7pYaTiAwUGd
rIveopIYXZkhYXUHfptxH6mw3ENQT0LaZ6RK9ULHFV2maJJnIX78UL77jS/6CH9MTTvY3R6iAMfG
ieEl2WoqCJliQuvXHC1vRv7SSFeEyFjiItxu012ZiaOCjpSNSOZHI1hrRxBFfGsBmBqe6skQuryO
Hku3PIRF1xihRhhcMFOwrCFx2luL8BLx2rcp2kPgG/a4InghdpjdWcbuM8UJjfGiC6D82nPYEjER
UVxb5naywepPM0SdA+r08qYKmn3ziyQk1BNja9+zH04eG/UYrcdbu+jPxKXnlBCnZ2HoHbDompjy
OfLtRgiPQxQByZxRB0IYS3aV8jjfE/KyzgOOxvRqN0lKUlbJROJpj4E26bW4h06dVkA5BtoEwcIl
PjXgDuWDPCx3Xs/cEQLV7CBdwmC3UjwOjIRiCZCY6hbVB5F3RNut4dP09S/GISU31BZx53BPrzCJ
aBs9uaL3nwGQHX8jx8i8Se5Zq0L8QbwoVaM+btmqWTucBqOGakvwx4lUUGrTDRhV5VF5CpWdD+8F
kwjBBXvTbkPjs0QaaTmy/59UdKII7RGy4iPisJshGkI7jDgnMZ9iwHEg0mxXJ6S53ZJeQGwspKyp
ra87j1idnpDnhkIZPUs5B6MMMA1TzxIOEyge1XqvAXAAkjgG0zCmAYCwF41B6cKUPXstKuZqAw4Z
lbkjag1OsWfo5lgBT4HI7A6QmFeBvQDL0C3kKjmqdrNAbc6Lu8F4lnlSSWpr4m7v6aONwaG7QG+J
wSDKJksq1DR1hB/QZhZ3CjbLKJusCbo9EI0COADOgJBoCYBCwkb1NHZRt2iQmkaw57Mk0uFFU7wq
QFUZBQ7bpnou1JiiP9dBLypeInU+Vtq8EcRRTBQSBMYcggWcDceocEQNQNEDIaIGQ+sG6gvLsSuR
B0Z7AzAeAPJmDaCb1B0CXkEJ408KQD9cJI9M2VRVuhGEYKGLNEHpgcJkXpgcFaIyAiyJCTvaJUCk
QgpJA8ITEIn0BIDkEeGeBPCBArggTGCY0KcgC2CJadfhBqlhffBEkIFruF4I9YXsPAlUbVKQj9Ap
ibvMfeZhxE5gSUEg7YTiJTcBQHEpDkr1CQs4lVS0UIJukF7c2jlsmvGgvIANWQN3zAoDLiwRwcIS
iEKznrQeuKPIRxUJm6dg+wJh3lHKgrHDMM3a4Q7VMCA9AHbrI5yPunBqGsdTFVtr8Ig/NQrEiRLM
PUHoM7wreQ75iQrUFDEUwcyyJ19VbsA60EWF5rz+3CLNS+8TrxHEQzgT9uw0I8DN3x3xhJibxzvC
Lg6YuZmn2ClU+FgSCRpj5iHLjK9yJJlEbCU4kCSabHHCRBEMaWvlG0bLuSGYWi2Xsr3Q+xRwr0av
Tm8+R6y+WoXWeimFsoSQxY8Ri8PMFWiY2yQV62DA8NuYjiGxySsZMGOQZgbIMzEUGKQXAuKe4kg1
fjdVZUhQRsJYI+VXAejMFUI/VRkrshZXnxFbykJyfv2CMnQiardN6s+cJgq0fNSO0RVKQjZUigKB
qSmtXoD8IjfaBSoSEoOww043lmY13otpkdSXTE1CSRHiPmeAKnVkTLAqeODVgZeQOevDC5SFX2HM
at0rKKx78rjDaEXBaCr1f4DIHqD/i7kinChIN9kdRoA=


--===============0694499777==--