Commit 8832927d authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Added nety_retry_count as a changeable variable 

Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap
parent 77296b3f

Docs/manual.texi

+6 −1
Original line number Diff line number Diff line
@@ -8220,7 +8220,9 @@ In 3.23, @code{INSERT INTO ... SELECT} always had @code{IGNORE} enabled. 
In 4.0.1, MySQL will stop (and possibly roll back) in case of an error if you

don't specify @code{IGNORE}.

@item

@file{safe_mysqld} is renamed to @file{mysqld_safe}.

@file{safe_mysqld} is renamed to @file{mysqld_safe}.  For some time we

will in our binary distributions include @code{safe_mysqld} as a symlink to

@code{mysqld_safe}.

@item

The old C API functions @code{mysql_drop_db}, @code{mysql_create_db}, and

@code{mysql_connect} are not supported anymore, unless you compile
@@ -28663,6 +28665,7 @@ and if you can use @code{GLOBAL} or @code{SESSION} with them. 
@item myisam_sort_buffer_size @tab num @tab GLOBAL | SESSION

@item net_buffer_length @tab num @tab GLOBAL | SESSION

@item net_read_timeout @tab num @tab GLOBAL | SESSION

@item net_retry_count @tab num @tab GLOBAL | SESSION

@item net_write_timeout @tab num @tab GLOBAL | SESSION

@item query_cache_limit @tab num @tab GLOBAL

@item query_cache_size @tab num @tab GLOBAL
@@ -50222,6 +50225,8 @@ each individual 4.0.x release. 














@itemize @bullet















@item













Made @code{safe_mysqld} a symlink to @code{mysqld_safe} in binary distribution.













@item















mysqld now has the option @code{--temp-pool} enabled by default as this















gives better performance with some OS.















@item

























include/mysql_com.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -116,7 +116,7 @@ typedef struct st_net {













  my_socket fd;					/* For Perl DBI/dbd */















  unsigned long max_packet,max_packet_size;















  unsigned int last_errno,pkt_nr,compress_pkt_nr;













  unsigned int write_timeout,read_timeout;













  unsigned int write_timeout, read_timeout, retry_count;















  int fcntl;















  char last_error[MYSQL_ERRMSG_SIZE];















  unsigned char error;

































libmysql/libmysql.c



+1
−0






























Original line number
Diff line number
Diff line








@@ -2902,6 +2902,7 @@ void my_net_local_init(NET *net)













  net->max_packet=   (uint) net_buffer_length;















  net->read_timeout= (uint) net_read_timeout;















  net->write_timeout=(uint) net_write_timeout;













  net->retry_count=  1;















  net->max_packet_size= max(net_buffer_length, max_allowed_packet);















}

















































mysql-test/r/olap.result



+5
−5






























Original line number
Diff line number
Diff line








@@ -15,13 +15,13 @@ insert into sales  values ( 'Computer', 'India',2000, 1200),













( 'Computer', 'United States', 2000,1500),















( 'Calculator', 'United States', 2000,75);















select product, country , year, sum(profit) from sales group by product, country, year with cube;













This version of MySQL doesn't yet support 'CUBE',













This version of MySQL doesn't yet support 'CUBE'















explain select product, country , year, sum(profit) from sales group by product, country, year with cube;













This version of MySQL doesn't yet support 'CUBE',













This version of MySQL doesn't yet support 'CUBE'















select product, country , year, sum(profit) from sales group by product, country, year with rollup;













This version of MySQL doesn't yet support 'ROLLUP',













This version of MySQL doesn't yet support 'ROLLUP'















explain select product, country , year, sum(profit) from sales group by product, country, year with rollup;













This version of MySQL doesn't yet support 'ROLLUP',













This version of MySQL doesn't yet support 'ROLLUP'















select product, country , year, sum(profit) from sales group by product, country, year with cube union all select product, country , year, sum(profit) from sales group by product, country, year with rollup;













This version of MySQL doesn't yet support 'CUBE',













This version of MySQL doesn't yet support 'CUBE'















drop table sales;
























mysql-test/r/variables.result



+1
−0






























Original line number
Diff line number
Diff line








@@ -120,6 +120,7 @@ set myisam_max_sort_file_size=default;













show variables like 'myisam_max_sort_file_size';















Variable_name	Value















myisam_max_sort_file_size	20000













set global net_retry_count=10, session net_retry_count=10;















set global net_buffer_length=1024, net_write_timeout=200, net_read_timeout=300;















set session net_buffer_length=2048, net_write_timeout=500, net_read_timeout=600;















show global variables like 'net_%';