bzr push into mysql-5.5-bugteam branch (sergey.vojtovich:3210 to 3211)

[Sergey Vojtovich]

 3211 Sergey Vojtovich	2010-12-17 [merge]
      Merge fix for BUG58948 to 5.5-bugteam.

    modified:
      sql/sql_class.cc
 3210 Jorgen Loland	2010-12-17
      BUG#58985: Assertion tab->quick->index != 64 failed in make_join_select() 
                 in sql_select.cc
      
      Follow-up patch. Add sanity check for quick select when it is
      decided that it should be used.
     @ sql/opt_range.h
        Add is_valid() to QUICK_SELECT*
     @ sql/sql_select.cc
        Add sanity check for quick select when it is decided that it should be used.

    modified:
      sql/opt_range.h
      sql/sql_select.cc
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2010-12-15 22:59:21 +0000
+++ b/sql/sql_class.cc	2010-12-17 08:56:43 +0000
@@ -3007,7 +3007,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]