From: Nirbhay Choubey
Date: April 27 2011 12:02pm
Subject: bzr push into mysql-5.5 branch (nirbhay.choubey:3470 to 3471) Bug#12329909
List-Archive: http://lists.mysql.com/commits/136199
X-Bug: 12329909
Message-Id: <201104271203.p3RC3Eqx025781@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0816784413=="

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

IDM0NzEgTmlyYmhheSBDaG91YmV5CTIwMTEtMDQtMjcgW21lcmdlXQogICAgICBNZXJnZSBvZiBm
aXggZm9yIGJ1ZyMxMjMyOTkwOSBmcm9tIG15c3FsLTUuMSAtPiBteXNxbC01LjUuCgogICAgbW9k
aWZpZWQ6CiAgICAgIGNtZC1saW5lLXV0aWxzL2xpYmVkaXQvdmkuYwogMzQ3MCBNYWdudXMgQmzD
pXVkZAkyMDExLTA0LTI3CiAgICAgIEJVRyM0Nzc0MSBycGxfbmRiX2V4dHJhQ29sIGZhaWxzIGlu
IG5leHQtbXIgKG15c3FsLTUuMS1yZXArMikgaW4gUkJSCiAgICAgICAtIGZpeCB0aGUgZml4IHRv
IHByb3Blcmx5IGRldGVjdCB3aGVuIGVuZ2luZSBpcyBOREIgYW5kCiAgICAgICAgIGFsc28gZG9u
J3QgZHJvcCB0aGUgdGFibGUgdDkgaWYgaXQgaGFzbid0IGJlZW4gY3JlYXRlZAoKICAgIG1vZGlm
aWVkOgogICAgICBteXNxbC10ZXN0L2V4dHJhL3JwbF90ZXN0cy9ycGxfZXh0cmFfY29sX3NsYXZl
LnRlc3QKPT09IG1vZGlmaWVkIGZpbGUgJ2NtZC1saW5lLXV0aWxzL2xpYmVkaXQvdmkuYycKLS0t
IGEvY21kLWxpbmUtdXRpbHMvbGliZWRpdC92aS5jCTIwMTAtMTAtMTkgMjI6NTE6MzQgKzAwMDAK
KysrIGIvY21kLWxpbmUtdXRpbHMvbGliZWRpdC92aS5jCTIwMTEtMDQtMjcgMTE6NTc6NTEgKzAw
MDAKQEAgLTEwMTIsOCArMTAxMiwxMCBAQCB2aV9oaXN0ZWRpdChFZGl0TGluZSAqZWwsIGludCBj
IF9fYXR0cmliCiAJaWYgKGZkIDwgMCkKIAkJcmV0dXJuIENDX0VSUk9SOwogCWNwID0gZWwtPmVs
X2xpbmUuYnVmZmVyOwotCXdyaXRlKGZkLCBjcCwgZWwtPmVsX2xpbmUubGFzdGNoYXIgLSBjcCAr
MHUpOwotCXdyaXRlKGZkLCAiXG4iLCAxKTsKKwlpZiAod3JpdGUoZmQsIGNwLCBlbC0+ZWxfbGlu
ZS5sYXN0Y2hhciAtIGNwICswdSkgPT0gLTEpCisgICAgICAgICAgZ290byBlcnJvcjsKKwlpZiAo
d3JpdGUoZmQsICJcbiIsIDEpID09IC0xKQorICAgICAgICAgIGdvdG8gZXJyb3I7CiAJcGlkID0g
Zm9yaygpOwogCXN3aXRjaCAocGlkKSB7CiAJY2FzZSAtMToKQEAgLTEwNDEsNiArMTA0MywxMiBA
QCB2aV9oaXN0ZWRpdChFZGl0TGluZSAqZWwsIGludCBjIF9fYXR0cmliCiAJdW5saW5rKHRlbXBm
aWxlKTsKIAkvKiByZXR1cm4gQ0NfUkVGUkVTSDsgKi8KIAlyZXR1cm4gZWRfbmV3bGluZShlbCwg
MCk7CisKKy8qIFhYWE1ZU1FMOiBBdm9pZCBjb21waWxlciB3YXJuaW5ncy4gKi8KK2Vycm9yOgor
ICAgICAgICBjbG9zZShmZCk7CisgICAgICAgIHVubGluayh0ZW1wZmlsZSk7CisgICAgICAgIHJl
dHVybiBDQ19FUlJPUjsKIH0KIAogLyogdmlfaGlzdG9yeV93b3JkKCk6Cgo=

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: nirbhay.choubey@stripped\
#   mhfq9j1nc1bkx7tj
# target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.5/
# testament_sha1: 83611723dc4407c1b7d92975325a46cd82d2002b
# timestamp: 2011-04-27 17:33:03 +0530
# source_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.1.12329909/
# base_revision_id: magnus.blaudd@stripped\
#   9z2oj2md7ohewtsc
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc2vrFoAA3DfgEU4WH///3/n
/uS////wYAcPvQAAFVoAoAAASko9JoTTTIaZqemk3pNJkxNMEYjATQyGNA4BhGE0xDAIBkAMI0yZ
MIwENDgGEYTTEMAgGQAwjTJkwjAQ0EqekFRk00NNAyaABkAYCZAD1GhoZDgGEYTTEMAgGQAwjTJk
wjAQ0EkhDQARk0AI0TITxKGnijaNT1PSaaeptpT1MraEYenuXyiwaFDv5CazWMGmVJA4SjqpMCJH
ffbmtaWSUeuaMxPZMYuxuIFRkkhyXVH5Fn79p9O8l6z55PcMhI+aoY3wImexSWqoJmahSnEHxyGs
VuYowLgXA9x+h48/qZunP2ofTidw/0k3Dv+k5jMfx6+JQpmteOGA+hVUMSSG8rOJ9x5w8JyfrCEP
Q8FuK6kQtY5nV+J9ny5eEw7Fu56NKMwF5h4KDvBeoiSZDyrfJYLzMEcSXYjaI6QbxIwcOdvIJgJB
BMIUrk7t8dBNdLK5zo8b/CKRWJNV5IuGIDCR4ocLSslDBEh6ZUkSyOcWbAipnlUigmzFMiAOcFAx
75lYFbexkW+sc4T6qziVCKjyinFYkOOAcKw1EokSUgDkSEp71XDgarsDUvhcXSRmFIagj1FZNERS
wps/OnSi8MH3wRonQxf6PwrCJJkMYRKWNJbuF34mFDkcRX7N6EsiK1klYXrZoNxseY1CR49ulE63
I4hWbLEtWzd9jbANoa1MvBSodqqswsHIkNcDEHsm3rQ8gTzFYSILH6836TOq0GFVKIdFJDywmIVV
aIwDFlaPHHogFltbjCaaMm4OVz9KTr3vmEO5m7Snwgn0p4nra4utLWgauUbLcIlEnqEZo10SYz1B
qtkRJgEgV4Y566mxJr0wUf+nhRmRsFKIlH4zKpOFOwBO1ikFqlUoYXhNZ5XDhTho456dF1MVwQxQ
ikWaMKNFk6ThsgZFyM5jGBd0mno1X64yXjnCa8YO9V2pi4aVk+ggDglKbjOl8KmCUGnljUNa4lua
+8LA18hcVj/SNZYrC95cQqkIDxz6JIUSTOg5BCKHSIDpMSHuZ4NmOdGQicfV06wyP5nrOBYbdjMh
5Kdx7DH2DTnYorxEH6llFI5kIElMTHGRGXsgrDyYzeEyepnYjGHkE8YxE8PqH1V5aMMeeDxjl5hQ
fqvOGLiw+ypKCUYMRRxYShUKMccfPAiIHyX1Z1hIwXVgVLdvDjixb2m6IJb7/8K5QS8V9z43nkZG
JMYmn1t+dwj9CrXYrJHD1UZk4I45YwD4Bn8PxULj2/34l6+II1AiQWxGSoPieJsNgEiV4ZC6vzDq
1SWHJabc7LDkir8w3GN9d5lzoJBBqtslGThC/i3MmEJxFUELYk8Bz1Qcs9JpDpKE61BOFCOc4qFy
IEYi4rdeUhJqX9ZAlRlZ1gyrKulZL8tBEjgdthvRuNTEhWwhMx18OnJXfCor3Pgdske65HFxqNtI
yvHXKdLR21OHmz0ZuDlKp8refSEeJjk41FxsOn+ZpyXa4s2/uPTZnHvDvEwtufCU/DqDPAoI3jhH
JFK0jAcV80VC3nJMIIImJyBKZTQUQKCe68uvRgafdXSbobE9CyLJKE0OiEdjPCqA3DA41Cc4gQO+
f0rsXFwi8cu9PXmRyOTdYFjuQI3EiLoHFetHMU4j2Egg6Kw9BkJjuENUVjUaD0JsC35eQwmJ0RPs
dgTc0HFpEs8Eqwvpc+Ln9OZrJiczA+ROIMgLVpDE2I6hGzR86TCtHcLYnTo/2TlrZtIjsW5J6kEQ
5CmDggrArHEEMH2Y63rX2hSITJVH7cHa1b17xjAntKExA8VbkkKxbkR8ExMQU4Wi8OBOSkoUP2HS
DNPVISs4+7grTBMQPIVBeMTpMxKMlYeU2o8hrEMOGd2k28RS64QzCxThdfIbZVgvJduKhsQlOSsB
6iD2U7L7iFSk9HY4XDO07kkVHA0pVZDDJPDrIrAQ86q9W+WJCJki8XqKwjFtalGM0cESAgnNYItI
iPfgWnQcFKLuzoFSNCoWzTLMtynRFJtptoTlPkmUhLajSMqSAjQA4lDNhv5COo6hiPtCdGh4G1Dq
TqGcXjz3BepAcSeNprDSQchjTkUqsOZYLtRjMWpXJT7U4V5gvajUjoe6oRSCKr1oKEdTlxDnfqVy
icLyCMKRFazMUTinNxQjfSB73iKOwRoKe25G9FyNhIcCpT6EOKWTxUj3gXGrcGbxBBPGEGxdgUHM
8lIiblStIiB/8XckU4UJDNr6xaA=


--===============0816784413==--