bzr push into mysql-5.6 branch (Georgi.Kodinov:4130 to 4131) Bug#14482472

[Georgi Kodinov]

 4131 Georgi Kodinov	2012-08-10
      Bug #14482472: CLIENT_CONNECT_ATTRS AND 
      CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA USE THE SAME ID
      
      Fixed CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA to take the 
      next available bit (21)

    modified:
      include/mysql_com.h
 4130 Manish Kumar	2012-08-10
      BUG#13886150 - RPL.RPL_INCIDENT FAILS ON PB2 SPORADICALLY DUE TO TIMEOUT 
            
      Problem: rpl.rpl_incident fails on pb2 sporadically due to timeout in
               include/wait_for_slave_param.inc. Apart from generic
               linux(linux2.6-x86-64bit, where we have knows timeout issues),
               the failure was observed on gcov-linux-x86_64 and 
               rhel5-x86-32bit. The test is passing in retry attempts in just
               257 milliseconds, it means it might be hanging sometime in 
               include/wait_for_slave_param.inc.
                     
      Fix: Adding a force-restart option to the test will restart the server
           before starting to execute the test.

    modified:
      mysql-test/suite/rpl/t/rpl_incident-master.opt
=== modified file 'include/mysql_com.h'
--- a/include/mysql_com.h	2012-06-19 08:38:47 +0000
+++ b/include/mysql_com.h	2012-08-10 11:48:02 +0000
@@ -178,7 +178,7 @@ enum enum_server_command
 #define CLIENT_CONNECT_ATTRS (1UL << 20) /* Client supports connection attributes */
 
 /* Enable authentication response packet to be larger than 255 bytes. */
-#define CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA (1UL << 20)
+#define CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA (1UL << 21)
 
 #define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
 #define CLIENT_REMEMBER_OPTIONS (1UL << 31)

No bundle (reason: useless for push emails).