bzr push into mysql-trunk-bugfixing branch (sergey.vojtovich:3444 to 3445)

[Sergey Vojtovich]

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

    modified:
      sql/sql_class.cc
 3444 Jorgen Loland	2010-12-17 [merge]
      BUG#58985: Merge 5.5-bt -> trunk-bf

    modified:
      sql/opt_range.h
      sql/sql_select.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;


Attachment: [text/bzr-bundle] bzr/[e-mail]