From: Sergey Vojtovich
Date: December 17 2010 4:08pm
Subject: bzr push into mysql-5.5-bugteam branch (sergey.vojtovich:3210 to 3211)
List-Archive: http://lists.mysql.com/commits/127210
Message-Id: <201012171600.oBHG0Y2s010227@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7324752823364445458=="

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

 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;


--===============7324752823364445458==
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\
#   9ggwhe6czygu4len
# target_branch: file:///home/svoj/mysql/server/mysql-5.5-bugteam-\
#   push/
# testament_sha1: 0c37b6d6f42fb40d665afcd508ade94b708483e6
# timestamp: 2010-12-17 19:08:59 +0300
# source_branch: file:///home/svoj/mysql/server/mysql-5.5-bugteam-\
#   bug58948/
# base_revision_id: jorgen.loland@stripped\
#   0s22a3jf9oxhqi5t
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVXEvP4AApzfgEAQWOP//1OC
Cw6////wUAWM9MOkNqOkUZFscJJJoCYAJppqJ4keIZI0NANGgkpE2htQZFPUNqNAAAAAACSIEjTJ
iaJPTJ6oPKBkBieU9Ro0HMAmAEwAAmAAJgACKiTR6RtKNPRGaDSm0ynk1DQA0DJ4yX5mTeh0PQvM
NeIZv1bKhZjCfDBAPeziOF3ZJVd13MMyt+4fqJQk9dbrNhMdoxk3edOzzCzaefOJt5VGpmxyxHgi
ZgxWNxx17NRL8Zwwg4vlK2TcbH9CrXQEebcEYMi09iFuow1Ogy/l2SDLXTBz/xKxTBksYqtJXweb
vO6QaGZkxyfgrcRjSuAIokiSY4YRgpyoFu6bzKghNBDNUt6II5Ls6vnZ033VmZe1YCKnm8ZJE3Vy
0L9YZQFLiAhBGCkHBeXSnZYY0310o8zD9lZMPiasM8H7tyByQWa6sLD4bFmF152Xz7c4Fnjo41Ai
TXHDsorZIHy8uCctWREpaq9CCWAhMWWvCSATKqeNsU1B6vVC0lhQRKytTOU2RTIduLt19bp6IqlN
qVBey0/ilQiMJTjmIoM4PyMIFbghkrI3EJYwy1whiSDjG6YRL/cgeoX6hwTKbAytoIypWksyn3hj
Ogco9IvPv8Z3qiPvWRn2kUNbnHBbYqNEA2WqpQQyfg80TmJiT0qyZM8RtBWVaosWqlWuAOOzSJw4
fdEZEnEZFcyH6NU0s81bgXyQXLFojqIinxuLKCHAsioRTQZXSVj3PwKdYjjbfKDSGUwWOvHqqE97
k+tNg+5VIKY3jWImK2tbbCxWtMdZ1WWFRKT6ZExpDAygnCkyCIuUKIeCojjFJEMfPyWR/FtLKOms
IOZ9fAj2rmgjTCjnYZhmG42c4wj+x1kTXxK8NqyRn4dr4lHAvugfVT9hEXA0W3My3+1HleJDpGVS
gF696erbSEvVfPUBguvtEiyMYiYm3ONLFybnpAGxji/nag0j8Id5FMe3cfJdApXJKYKbaYaM+HRB
Td2kV2iHwdaSHcZjAE7HshwpUKZyjJMKyKSiWUEbd5bom2VBfiSJgCDRjx1XjMxbNj7lLhpOcLq/
jtHAKy595C4dA12s4Bhhhlx7quTNxGdjaVibZRxUiuI8vudpST1bh0U5iMUfTCsphiKs0S/N5lDm
c7Dk9BglpXb2lB6epEA3O8k95sSKyCaBQWt93I3Gdzdni72bRgl0ZSb7nK9n+484ci/cRCgI9MuN
CAJzCfB78L5B02BnDbvXAG8XR50Cx8qh8VgEfLsHLcmL3oBsTqSoYpNzraEO5MAXEugzw439bS0p
KrV0vWsj2lZZ6mLW8djN5oGtx9w7wc4PBC4NQE1mRH0hgTI5ErxkRSDr4BwDSaDyZlTjBMLchE0D
kRktAazbQ6pk1Vp1qBqM41SZMiulRJJgj1sTisid5Alx3KVEEmQwr1dF2+0MIX9afUu89KS2K4Br
A28SiTX6inUPRoThQPPtoaEDxZPg5i0Nm0hAaGo33OSp14ZEiDHZt2sHrZoY57S+AxBbzKhgUmd5
Y5mUmAhdZkOVKdWQzSaqpJlUSpK5G9dy7VJZpJzYLmfkbEGHfuGWhmtnoSeZcWG5qWZpZaB0ECfa
ihVsRJQK48k4qsfgOGMV1nccCUTyiTzl5YHCxCllMbB8ECljKCVGrqCm90wDrfArK4GoKsu5CTk7
2ZYOHKgaF2K10sgxOF1YgiwJFoRVgaXiHRxMzFUFTUaA/xdyRThQkFXEvP4=


--===============7324752823364445458==--