List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:January 24 2011 3:05pm
Subject:bzr commit into mysql-trunk branch (Georgi.Kodinov:3546)
View as plain text  
#At file:///Users/kgeorge/mysql/work/B59453-trunk/ based on revid:horst.hunger@stripped

 3546 Georgi Kodinov	2011-01-24 [merge]
      merge

    modified:
      sql/sql_acl.cc
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-12-17 11:28:59 +0000
+++ b/sql/sql_acl.cc	2011-01-24 15:05:24 +0000
@@ -8068,7 +8068,7 @@ static bool send_server_handshake_packet
   end= strmake(end, plugin_name(mpvio->plugin)->str,
                     plugin_name(mpvio->plugin)->length);
 
-  int res= my_net_write(mpvio->net, (uchar*) buff, (size_t) (end - buff)) ||
+  int res= my_net_write(mpvio->net, (uchar*) buff, (size_t) (end - buff + 1)) ||
            net_flush(mpvio->net);
   my_afree(buff);
   DBUG_RETURN (res);

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into mysql-trunk branch (Georgi.Kodinov:3546) Georgi Kodinov24 Jan