From: Sergey Vojtovich
Date: December 17 2010 4:14pm
Subject: bzr commit into mysql-trunk-bugfixing branch (sergey.vojtovich:3445)
List-Archive: http://lists.mysql.com/commits/127211
Message-Id: <201012171606.oBHG6Jsd018536@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5166456386587446205=="

--===============5166456386587446205==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/svoj/mysql/server/mysql-trunk-bugfixing-push/ based on revid:jorgen.loland@stripped

 3445 Sergey Vojtovich	2010-12-17 [merge]
      Merge fix for BUG58948 to trunk-bugfixing.

    modified:
      sql/sql_class.cc
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2010-12-15 23:10:37 +0000
+++ b/sql/sql_class.cc	2010-12-17 16:14:15 +0000
@@ -3012,7 +3012,7 @@ void Security_context::init()
 {
   host= user= ip= external_user= 0;
   host_or_ip= "connecting host";
-  priv_user[0]= priv_host[0]= '\0';
+  priv_user[0]= priv_host[0]= proxy_user[0]= '\0';
   master_access= 0;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   db_access= NO_ACCESS;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergey.vojtovich@stripped\
#   c2sx7tw4rrd3f4lh
# target_branch: file:///home/svoj/mysql/server/mysql-trunk-bugfixing-\
#   push/
# testament_sha1: 1ce8f6088bffe05c49fa442a963022a1863bd70c
# timestamp: 2010-12-17 19:14:46 +0300
# source_branch: file:///home/svoj/mysql/server/mysql-5.5-bugteam-\
#   push/
# base_revision_id: jorgen.loland@stripped\
#   vju3iapusxl21r39
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfD9YxIABC/fgEAQWOP//1OC
Cw6////wYAdvvux61qt25c13PXrp73OqClQQZRNJk00NNDZTEGQBoAaAAElEm00pvJoYkibUeow1
GE0YTIGASUnqbQmqeJpTRtMU/SjAEaYgGADmATACYAATAAEwABFIgEyaibNE9TKeSZPU0xQ9Agwe
lBFIghkwRpoSbKaZJmpnqaTQ0yGgoduXYyxApOsUjeIiu8wAPKjrtQEtIkRIlJAqNNqSo00wSdVR
LprxzPkd5DERAYfoP80NFZESLLLZ0Qzgu06qScU01xOuXU/8e3mmOYcz/KHP+7DWRBlwyJTQcTKN
IDK7dRsOEonU1fqCVLbbEjruxczmk3jWtH8EB9w71lyJIa3g7hM8GvjYnJ3H2Twu5PW0L841Q8j+
wMEQovvyGlvEcycq5SiJV5X1LdlKUEoCT9ZZJiaMGSeIgVqhSxxpNs/ZpFcxjWxGeJOKUc5DJpJ0
rXENcTRLUBal/VuNHW/fowsdYe1uyG6EJUniwqFnaSVUdHfoPKbfqm0LxAVFwJoVGZU1rdMlKmV5
iBsF2kP8slAkK3WQYo8+FHq8BMbaAA558d+lZ7u5KxzNDdppy4mhllslFDKM4bYF4gLuFTd7sDKA
AR1p+TiWtgveZWxsk3Zbu8pLC6kreMPLTbZQhDXdqjixUfih2pmSFSchE1lkJ7EVH3aTG407NTVM
J0auBdbKmF6yakmdEqtIgwuuHE3OTzP8T8bN1kokyAswkMyY0ZnkSEWG0jiXlpnrmr3VwIsB2gYR
0I42j3Ahh22JKNpoJFey9S2Z+zatI8xhopvJLeyG23kY43lFU4MHgbLGdxw7038SwSYyKumqT+vx
OrAijQ/2OSG2KgY4jPlDBrDdRcFaTLBzSXoXDbdfQQ5vN8p2yLWIrfTSFvWIqPnJxhGaWqpN4xIr
MrSLkoboRfcVUFRjfzGCCdlBfkTPy5yaYMaKLQM77fnhPVVtxXatCdajOARNHYKUqjB01imJaKDm
ZkriO9TL5sEMNQ9xZw5xDB7LqJ+inLXCyeml1TKyDJkRIQhirHCd1uMFGiJqu/LBEBqCH4yUIiGp
0ISjHclFc7ovTQgrIqySvTiwblarmKWFhmEhripmBRJraxJTTGqtCyph+vomj/j63cbT04kQkzq/
U7NZ6nMSsYAK7YYYSII8Np96J0fhknVqD4lmXJ6gbPLtLe1kgccJh9DUxhQIlnF8yyDJHOJvzog4
LIIDr6n0EQgNkD7qKnMzaXQd1TZajo+h86wN+ohqhsPYSOmPvg4RLvGOogazUbGOjaT6eARnWvG/
GSwNxTrku5fcWSOgG06QmGM9MMiNWsZFNWd4mG/wKa5QZ9AKZ6vlgVeDuYUcIfUCSIXIhkzvxXAk
lki8mS1+9nnyHM53t8YWjPwsA2lDUsDgZ9/Mx0IIgstu9abNOm18c8j5nQkAmWhHCmdkcq6GdMFO
dR4rvJcK8zZbpOz6nMZ8TBi3pjZUWaBnFlvQ9VMX4fk3EieGUxS5YLHkJNkcgtstoU4asS2jhXD3
KiFlgKAJyKCCAMjHLrZnM9WSj2p3tj3PFZKWLgizdadu7wNhkmo9mQ+LxdKUU25nk3Xh3F6du9NS
az9nu8yPMOJceJMaBk/DeWIwoEj81uPa+VD6L3GC0Gxghjh3pxoUfcJ50nmvsoLNDV5uQ2HgcWQe
zxZHDJqRZcXs2AQ1PknRJicgKB9Rq80Marugg+/Fyam7JTc9Klhm4GJ6kFZ1tEvDJwHxRdDvvIbz
ah3q5K+AnYO8Ha4qdLNDnBSBpG8DHQyRCE38l5QMOb1voODa/HQIFbuEk5gcSgqDAbtjuLHsK2tL
To2JN1GgiwIGALyssaRIWkpzlJihOLVpJkFPI6NJWLVAEIYphQSIMp5E8ebLcn0eojwHMBLweHwZ
2BeeqIYofwM15TQ8cppNF8mx96anqXf7WCEJpa9xmmi1N1RYWMMt5weB1YcW4WwuOpXB8mEmKnrc
hPjiNYBg+T0pklxcMCu7p0mz4VL1F7sLUuutHWnIaW2ohDMDq9ns1NVISe4f4PsRwSCUgkSIl2Yd
sMF5UWqSPfYHnBEEfBsLCDZsLmUyaUbwLgxhqEp3je1Ob6MmZuoNAkw8nF5h5uqR8yTfodHAfO4S
lNRtQuQ96LSksqdcwNj2HrqcV1nk90Dk+bFpaXSOgWJuPaJrS096YGKFR1IvYpqeAj1jprS5cbiB
gtYJNlq0MNx0DIRhzfJe9rcWu5LUtc1/8XckU4UJDw/WMSA=


--===============5166456386587446205==--