Commit 7a35921b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mysql_src/mysql-4.0 

into mysql.com:/home/mysql_src/mysql-4.1-clean


Build-tools/Bootstrap:
  Auto merged
sql/net_serv.cc:
  Auto merged
parents 815f6222 d8d9f79e

Build-tools/Bootstrap

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ $opt_dry_run= undef; 
$opt_export_only= undef;

$opt_help= $opt_verbose= 0;

$opt_log= undef;

$opt_mail= "";

$opt_mail= "build\@mysql.com";

$opt_pull= undef;

$opt_revision= undef;

$opt_suffix= "";
@@ -431,6 +431,7 @@ Options: 
                           include a log file snippet, if logging is enabled)

                           Note that the \@-Sign needs to be quoted!

                           Example: --mail=user\\\@domain.com

                           Default: build\@mysql.com

-q, --quiet                Be quiet

-p, --pull                 Update the source BK trees before building

-r, --revision=<rev>       Export the tree as of revision <rev>

sql/net_serv.cc

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,8 @@ my_bool 
my_net_write(NET *net,const char *packet,ulong len)

{

  uchar buff[NET_HEADER_SIZE];

  if (unlikely(!net->vio)) // nowhere to write

    return 0;

  /*

    Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH

    length. The last packet is always a packet that is < MAX_PACKET_LENGTH.