From: Dmitry Shulga
Date: June 15 2011 9:18am
Subject: bzr push into mysql-5.5 branch (Dmitry.Shulga:3451 to 3452) Bug#60987
 Bug#12403662
List-Archive: http://lists.mysql.com/commits/139221
X-Bug: 60987,12403662
Message-Id: <201106150918.p5F9Ic0l020539@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1633995655811693213=="

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

IDM0NTIgRG1pdHJ5IFNodWxnYQkyMDExLTA2LTE1CiAgICAgIEZpeGVkIGJ1ZyMxMjQwMzY2MiAo
Zm9ybWVybHkga25vd24gYXMgYnVnIzYwOTg3KTogTE9BRCBEQVRBIExPQ0FMIElORklMRQogICAg
ICBjYW4ndCBwYXJzZSByZWxhdGl2ZSBwYXRocyAiaGlnaGVyIiB0aGFuIDMgbGV2ZWxzIHVwCiAg
ICAgIAogICAgICBXaGVuIHRyeWluZyB0byBMT0FEIERBVEEgTE9DQUwgSU5GSUxFIHVzaW5nIGEg
cmVsYXRpdmUgcGF0aCB3aXRoIDMgb3IKICAgICAgbW9yZSBsZXZlbHMgdXAgaW4gdGhlIGRpcmVj
dG9yeSBoaWVyYXJjaHksIG15c3FsZCB3cm9uZ2x5IHBhcnNlcyAKICAgICAgdGhlIHBhdGggYW5k
IGFzIGEgY29uc2VxdWVuY2UsIGNhbid0IGZpbmQgdGhlIGZpbGUuCiAgICAgIAogICAgICBUaGlz
IGJ1ZyB3YXMgaW50cm9kdWNlZCBieSBwYXRjaCBmb3IgYnVnIzU4MjA1LgogICAgICBUaGUgcmVh
c29uIGZvciBidWcgaXMgdGhhdCBpbXBsZW1lbnRhaXRvbiBvZiBmdW5jdGlvbiBjbGVhbnVwX2Rp
cm5hbWUoKQogICAgICBkb2Vzbid0IHRha2UgaW50byBhY2NvdW50IHRoZSBiZWdpbiBvZiBidWZm
ZXIgYmVpbmcgcHJvY2Vzc2VkIGR1cmluZwogICAgICBoYW5kbGluZyBvZiBwYXRoIHRvIGZpbGUu
CiAgICAgQCBteXN5cy9tZl9wYWNrLmMKICAgICAgICBmdW5jdGlvbiBjbGVhbnVwX2Rpcm5hbWUo
KSB3YXMgbW9kaWZpZWQ6IGZpeGVkIHdyb25nIGNvbXBhcmlzb24KICAgICAgICBjb25kaXRpb24g
d2hlbiBoYW5kbGluZyBzdWJzdHJpbmcgIi4uLyIgYXQgdGhlIGJlZ2luaW5nIG9mIHRoZSBidWZm
ZXIuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3lzL21mX3BhY2suYwogMzQ1MSBNYXJrbyBNw6Rr
ZWzDpAkyMDExLTA2LTE1IFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS4xIHRvIG15c3FsLTUu
NS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yZW0wcmVjLmgKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3JlbTByZWMuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Vu
aXYuaQogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MHZlcnMuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVj
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ215c3lzL21mX3BhY2suYycKLS0tIGEvbXlzeXMvbWZfcGFj
ay5jCTIwMTAtMTItMjkgMDA6MjY6MzEgKzAwMDAKKysrIGIvbXlzeXMvbWZfcGFjay5jCTIwMTEt
MDYtMTUgMDk6MTg6MDggKzAwMDAKQEAgLTE5Myw3ICsxOTMsNyBAQCBzaXplX3QgY2xlYW51cF9k
aXJuYW1lKHJlZ2lzdGVyIGNoYXIgKnRvCiAJICB3aGlsZSAocG9zID49IHN0YXJ0ICYmICpwb3Mg
IT0gRk5fTElCQ0hBUikJLyogcmVtb3ZlIHByZXYgZGlyICovCiAJICAgIHBvcy0tOwogICAgICAg
ICAgIGlmIChwb3NbMV0gPT0gRk5fSE9NRUxJQiB8fAotICAgICAgICAgICAgICAocG9zID4gc3Rh
cnQgJiYgbWVtY21wKHBvcywgcGFyZW50LCBsZW5ndGgpID09IDApKQorICAgICAgICAgICAgICAo
cG9zID49IHN0YXJ0ICYmIG1lbWNtcChwb3MsIHBhcmVudCwgbGVuZ3RoKSA9PSAwKSkKIAkgIHsJ
CQkJCS8qIERvbid0IHJlbW92ZSB+dXNlci8gKi8KIAkgICAgcG9zPXN0cm1vdihlbmRfcGFyZW50
ZGlyKzEscGFyZW50KTsKIAkgICAgKnBvcz1GTl9MSUJDSEFSOwoK

--===============1633995655811693213==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   plmirk1gfi3vapvu
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bug12403662/
# testament_sha1: 8c282d2670b353f7fa0ca0a29d66fc70856700f7
# timestamp: 2011-06-15 16:18:34 +0700
# base_revision_id: marko.makela@stripped\
#   hobymycvru129t9a
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYrKiqUAAdxfgEAQWef/938l
jIC////wUAUmXbJ0eacdtze9bNNwZJNJ5Kn5kExJ+k0BPSMppsp6mT001M1D1AkqNCPTJPUxqEek
00000GjQABoGgZCAmptJiZTyhpqeKMTQAAAAMUU/U1MmaKfpTR6nqNqNDQNANAGgASRTRPEUT8o9
UbKbJ6JqNoNNTZT01A9QHqb5vfuvcnvz6iy9HIINyzTg7OigI1v/OebFJnV8RPHygW2Lrqphy1oi
Dwx9C2NiBwSPouIe1rt44j65/MdsVa5uj68BD9KWcFVfNEWXxelEyujb+LquWE+6dbYV7H+EHYUE
hHB79lgstQSTBIDqdFjsUR2XQvaA8btHPgOr09/B+/v4Z88Q5CqF5hE82BQ78tWHnOk/CSF8KzYC
Ou3camyZjfdRSC+QvbkWHRCW9NPHiIsoBGgsDRez2qwYjSFJC4yjp2CpiiAg7QWRmMgrmIDziDBQ
UI5xAedBFYyjQGirWAeKFpAuF3ksgN9Fxtj4bH1lapbXJLuKYTPsIGm8QB0vNp4mfImWCqGH5ohc
2I6gddS3AjCD2WTuXPErGNAw4nnfDHLjxze56z3VCnRlA0qOEtlgwND2T0ETGjVuMICQm26p/hwB
pAREb0Ek4OOeqvfRN+QvkLDgVnw5b4jOx7SktJ1GnRIqE2iGJWxvJ7akEw6YjaS5DbW6J25RkNN9
xEbalC6LvJRTyKJKytgM1Bm1RBtJwsZ2zMRpEzMLAesKodkp3MR0BGbdWNV8RYNbkGPdgr7BQJHB
Vq2MFSD7zAPDmi4wVyKJESknR3jw9lvR4W81Dke/W+XGI5fk4n2PUrLmYbdSbys8vrwMXEh+CoxH
EcGMQPsgWLeTx5HR4o4cIGysoDVV54fDOeSalmYqYC7xEFymuRxWThWca8IpkdhRUwebhap4JVpi
UT5kaZQeoTXnpku6jpLSuajrzaN0qkt+Ze1Ueq3LQEw0bcLiNVJuJ9l9pXzdq6M2LPhMTsI5zLNI
jFOlEghyKlAIl2VmtYveGHM1hyLZiNAQ2q0C2j+Bp4j8BK3StDbXd5FHOEXgEtYIMBOPbTRqC7o9
rYaJdFSwjg0D2FEQqcn+mqRTNndLTBTMJUaL0wxa0k5KvNAvGTHWPorxBHwKndnJNddc4T4q3DF4
6EuFoEy0AMTzEpHIdekijwp6zrLwtMZIT7dGkwd1gMD/dnahEWQyO2+AAeCq0GbUGjyNwxoNKKRM
wCqaFE86XdrKmbmePBU7qhSYMCmLLhaSLdgdqlnxX+dSsSYVlsjNYVX3mHgwQl7HOM/FlfBOCvSK
Qsb0hhzT6LyBp5Y3WY6OpXCeJphd7wlbUuWMIBY6/rI2Uy+IWCGTEJrUBeI3PYGgU7Ve7tjrBCWo
2FjjxUmL8TCwaM51RB9xaD08K25Z7XVFeRWNVe+GTHByoquHSuiHcLIQeEiRBQnChFyITPfm5i0J
iGRQRgHHOeC8zl1pq2UMtYL0iTF1Y1boozxH9HI2HIRELKAw6YA48u68iKgKLOZCaoheoKool7V1
Bp3CcZaAtQapRUDlItLAnFnNLJAwM97CG2mEZAoXzAYVeOsSaJjEXGDiiUn3vadFb4fgISGO91sn
rKq+EGVQD5ZDmpft5ckptECM2A0C9jPF8/8iDFUPw9xZmCTzDnXuGl7z2o4neo6bbhxEnjUyqjqg
NBAqBgA6TFl3kIcqqMhDV1AdgGmpi2wsITnCK26xc5lJJgpXuuXaLzFSOjKTQlLHlb1FPKrWIILU
pZlEYF2S5PKE7/F3JFOFCQisqKpQ


--===============1633995655811693213==--