Commit 24b048f5 authored by unknown's avatar unknown
Browse files

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

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


sql/net_serv.cc:
  Auto merged
parents 0b7895b9 87e1a296

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>

mysql-test/r/rpl_many_optimize.result

0 → 100644
+9 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create table t1 (a int not null auto_increment primary key, b int, key(b));

INSERT INTO t1 (a) VALUES (1),(2);

drop table t1;

mysql-test/t/rpl_many_optimize.test

0 → 100644
+20 −0
Original line number Diff line number Diff line 
# Test for BUG#7658 "optimize crashes slave thread (1 in 1000)]"



source include/master-slave.inc;



create table t1 (a int not null auto_increment primary key, b int, key(b));

INSERT INTO t1 (a) VALUES (1),(2);

# Now many OPTIMIZE to test if we crash (BUG#7658)

let $1=300;

disable_query_log;

disable_result_log;

while ($1)

{

 eval OPTIMIZE TABLE t1;

 dec $1;

}

enable_result_log;

enable_query_log;

drop table t1;

# Bug was that slave segfaulted after ~ a hundred of OPTIMIZE (or ANALYZE)

sync_slave_with_master;

sql/net_serv.cc

+2 −0
Original line number Diff line number Diff line
@@ -255,6 +255,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.