From: marko.makela
Date: October 27 2010 6:48am
Subject: bzr push into mysql-next-mr-innodb branch (marko.makela:3270 to 3271)
List-Archive: http://lists.mysql.com/commits/122124
Message-Id: <201010270649.o9R6FBPw017783@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1321201872=="

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

IDMyNzEgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yNyBbbWVyZ2VdCiAgICAgIE1lcmdlIGZyb20g
bXlzcWwtdHJ1bmstaW5ub2RiIHRvIG15c3FsLW5leHQtbXItaW5ub2RiLgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCiAzMjcwIFN1bm55IEJhaW5z
CTIwMTAtMTAtMjcgW21lcmdlXQogICAgICBNZXJnZSBmcm9tIG15c3FsLXRydW5rLWlubm9kYiB0
byBteXNxbC1uZXh0LW1yLWlubm9kYi4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3VuaXYuaScKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYu
aQlyZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTAxMDI3MDYzNzAxLWNwMnB6YmZpdjQw
bXJiN3cKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAyNzA2NDM0Mi1lcTV4OGtoOHZ0ZzluZDhuCkBAIC03OCwx
OSArNzgsNiBAQCB0aGUgdmlydHVhbCBtZXRob2QgdGFibGUgKHZ0YWJsZSkgaW4gR0NDCiAjIGRl
ZmluZSBoYV9pbm5vYmFzZSBoYV9pbm5vZGIKICNlbmRpZiAvKiBNWVNRTF9EWU5BTUlDX1BMVUdJ
TiAqLwogCi0vKiBpZiBhbnkgb2YgdGhlIGZvbGxvd2luZyBtYWNyb3MgaXMgZGVmaW5lZCBhdCB0
aGlzIHBvaW50IHRoaXMgbWVhbnMKLXRoYXQgdGhlIGNvZGUgZnJvbSB0aGUgInJpZ2h0IiBwbHVn
LmluIHdhcyBleGVjdXRlZCBhbmQgd2UgZG8gbm90Ci1uZWVkIHRvIGluY2x1ZGUgdXQwYXV4Y29u
Zi5oIHdoaWNoIHdvdWxkIGVpdGhlciBkZWZpbmUgdGhlIHNhbWUgbWFjcm9zCi1vciB3aWxsIGJl
IGVtcHR5ICovCi0jaWYgIWRlZmluZWQoSEFWRV9JQl9HQ0NfQVRPTUlDX0JVSUxUSU5TKSBcCi0g
JiYgIWRlZmluZWQoSEFWRV9JQl9BVE9NSUNfUFRIUkVBRF9UX0dDQykgXAotICYmICFkZWZpbmVk
KEhBVkVfSUJfU09MQVJJU19BVE9NSUNTKSBcCi0gJiYgIWRlZmluZWQoSEFWRV9JQl9BVE9NSUNf
UFRIUkVBRF9UX1NPTEFSSVMpIFwKLSAmJiAhZGVmaW5lZChTSVpFT0ZfUFRIUkVBRF9UKSBcCi0g
JiYgIWRlZmluZWQoSEFWRV9JQl9QQVVTRV9JTlNUUlVDVElPTikKLSMgaW5jbHVkZSAidXQwYXV4
Y29uZi5oIgotI2VuZGlmCi0KICNpZiAoZGVmaW5lZChXSU4zMikgfHwgZGVmaW5lZChfV0lOMzIp
IHx8IGRlZmluZWQoV0lONjQpIHx8IGRlZmluZWQoX1dJTjY0KSkgJiYgIWRlZmluZWQoTVlTUUxf
U0VSVkVSKSAmJiAhZGVmaW5lZChfX1dJTl9fKQogIyB1bmRlZiBfX1dJTl9fCiAjIGRlZmluZSBf
X1dJTl9fCgo=

--===============1321201872==
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-next-\
#   mr-innodb/
# testament_sha1: cb2ec14515aa3449672f2f54c6ec445a063eba09
# timestamp: 2010-10-27 09:48:56 +0300
# source_branch: bzr+ssh://bk-internal/bzrroot/server/mysql-next-mr-\
#   merge/
# base_revision_id: sunny.bains@stripped\
#   cp2pzbfiv40mrb7w
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbqfL6QAA0tflAAQUmf/91cm
eAC////wBAAIAFAF7V6rtWtVTNjNzmuqDQSiaieqb1T1Afqn4pqekNBpo0YhoxDTQElJpkMiep5C
Kep7VP0moP1QHqAAGgEkQQRT/Uno09SnqZNlNhR6jJ6gYgHqDmATACYAATAAEwABJIIyBMTTEmQa
NUe00mU9QaB6mmjioEdOU0mgqJRQjRuPfsStRVAk+85ijq2Mr8HmTvxO97nGZmWGAfeESRKmaORl
xZ5yg8nOhp8dRv7Y/NflT43JNlx1wgsxj6ce7UYCZbdZCLtS8MvDCFReIPdL3iIRcWIoBw35f55i
qgV+QX4cXCifYrxRFsWZzv7OTQKy87R3mIsJ13QeUCySFTfj9hdgIjhUa2Du+PoxpYlCDh7OpDxH
iaKxzpkCkAuImQLAeuAh6kKgVbAESJxdqXSPB2hN0JAUuRC/XaRsGJ94rVDsESy2PHODsJlofaUU
UC7mATqHcdNQvzrPFDPV5YRE7LjN5Ifug7DmWwMReU+S4dR2Kn4Fv0NId2FK2BaSHC6GDzdqVYKF
LYsJ6nkzRAovNdDSucysvqi1jr5mBhY/hASIDsKh7GtjCpyglmfkMe4isqVtGSfhpgP1ljtM6aHi
cIfUmzs6uFeTLSwVxaWNAnjqHb+qFssxO0E6Mhu9Z7TuaBSLW0mLeMXiGkUCGJEjba4rB6UjIVt2
JMvYsY5zu1eQU71dgb+Cna7addOiVBnX9sZl5EW42JT08bhW4w+wrBEJmvfpCqsa1ARi4UR0hvHC
LahNoOQ8Tid1lpNz8Gs8KRauAkSMXi1iRm05CayIi4uE4vkVDXcrFlbQWXi4EzgJ9UStWWXOpypk
WqUUTIUJF2onC5istwiJjc4tzaiVvGwRMWhN2sR5jI2ycYg4oMrz6CvEU2Wl4DDWl5uMxomaUx4U
pwmKRohJJhUyGMoocwxOJgUDIcnZoHrOB7igtO5vATCD7W0ZhkMzePhC0R1fnanD9vzhiWGgZKm6
ISx1miQFTrGC6rTmdx1BH9kO27dkhV7YjUoikCPdmZjinfWkfJIEeoeLlSxf13k9wnQNCDYkfxO3
eZ02KVWi9hVVC0iWb1C01fzAkLj7LuH349RMrhdR5cL1deJnd5h98sYDeVrhkhPFuSFuPeilbxYZ
+RoZdByhqsoi0TAXYBNL1clVigq6RVuq4te4PTStDLrN/c3E+ORmzkxgikJ2M1WhPthzk8W3chF1
TcbDyIekqwIJVkpP3ubGO6F3RhouPFpQssqOpdseNI3x6qPxOLOjYMGQEJKbrKCiUEUTv7hKXXyZ
5Rf2nYQqBUCRvCMQEbluwW2yZz8g3OJiQxxDCPRMwD5Oh5lywcuoyYdkLc61A7052JubHHkJ3EBq
iv6J0nSNgMDyC8LDk2w5L7iYoOIXbxPBuXn7xYpb3XI4C7+RmPMEE6ILvIUFNPPV7eTkmF+SvBHy
e4tEs9RI9w8OAGwDYOBJ5akJgyaTYTJC6WL5AlyYw2gjb2eR5jOhhxn2GhF5OmJgHEgOtKCIcjov
0UyDdhIkOJpmFAeTJIXwFKTE7x5E4FULpFDi2CtgK8QzCYVsBcvAzGBDxYhvSF9WJIPjqPivlIU0
qkQoeKeOi6MdFSsMNRwwohSeNeUTIR8KYnUBrM9ohUIBxCCrUR4jbUc1EIrHzpEipD8lC8hQejqE
mFSGuYoXlJZauLDWE5oHEjqwzEvcGCSVDJU2WFpnAePC4YhCowDobxOUCeRWGaqcRSvExjhUc0W4
nelmdg2LEoJR8EoCqYpXMWpZIPVeQoaCPRcBH52o4nb9VAXF5YBtNGNgmP17BEhHAOgj8Nb1joud
xl/wXlx/4u5IpwoSF1Pl9IA=


--===============1321201872==--