From: Georgi Kodinov
Date: August 10 2012 12:57pm
Subject: bzr push into mysql-trunk branch (Georgi.Kodinov:4220 to 4221)
List-Archive: http://lists.mysql.com/commits/144546
Message-Id: <20120810125714.45430.80818.4221@dhcp-uk-twvpn-2-vpnpool-10-175-48-241.vpn.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4221 Georgi Kodinov	2012-08-10 [merge]
      merge

    modified:
      include/mysql_com.h
 4220 Manish Kumar	2012-08-10 [merge]
      BUG#13886150 - RPL.RPL_INCIDENT FAILS ON PB2 SPORADICALLY DUE TO TIMEOUT
      
      Null merge from mysql-5.6 -> mysql-trunk

=== 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).