Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-01-29 14:35:09+01:00, msvensson@stripped +11 -0
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
MERGE: 1.1810.2371.64
sql-common/client.c@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.83.1.25
sql/mysql_priv.h@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.290.1.140
sql/mysqld.cc@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.439.1.151
sql/net_serv.cc@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.88.1.8
sql/repl_failsafe.cc@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.53.1.11
sql/set_var.cc@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.125.5.35
sql/slave.cc@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.241.1.47
sql/sql_parse.cc@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.426.1.176
sql/sql_repl.cc@stripped, 2007-01-29 14:35:06+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.133.1.23
vio/vio.c@stripped, 2007-01-29 14:35:07+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.28.2.2
vio/viossl.c@stripped, 2007-01-29 14:35:07+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.34.2.7
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: pilot.mysql.com
# Root: /home/msvensson/mysql/bug22943/my51-bug22943/RESYNC
--- 1.470/sql/mysql_priv.h 2007-01-17 19:45:39 +01:00
+++ 1.471/sql/mysql_priv.h 2007-01-29 14:35:06 +01:00
@@ -87,6 +87,9 @@
bool net_request_file(NET* net, const char* fname);
char* query_table_status(THD *thd,const char *db,const char *table_name);
+void net_set_write_timeout(NET *net, uint timeout);
+void net_set_read_timeout(NET *net, uint timeout);
+
#define x_free(A) { my_free((gptr) (A),MYF(MY_WME | MY_FAE | MY_ALLOW_ZERO_PTR)); }
#define safeFree(x) { if(x) { my_free((gptr) x,MYF(0)); x = NULL; } }
#define PREV_BITS(type,A) ((type) (((type) 1 << (A)) -1))
--- 1.604/sql/mysqld.cc 2007-01-18 18:38:43 +01:00
+++ 1.605/sql/mysqld.cc 2007-01-29 14:35:06 +01:00
@@ -4036,10 +4036,9 @@
static void create_new_thread(THD *thd)
{
+ NET *net=&thd->net;
DBUG_ENTER("create_new_thread");
- NET *net=&thd->net; // For easy ref
- net->read_timeout = (uint) connect_timeout;
if (protocol_version > 9)
net->return_errno=1;
@@ -4333,12 +4332,7 @@
}
if (sock == unix_sock)
thd->security_ctx->host=(char*) my_localhost;
-#ifdef __WIN__
- /* Set default wait_timeout */
- ulong wait_timeout= global_system_variables.net_wait_timeout * 1000;
- (void) setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&wait_timeout,
- sizeof(wait_timeout));
-#endif
+
create_new_thread(thd);
}
--- 1.102/sql/net_serv.cc 2007-01-11 14:09:58 +01:00
+++ 1.103/sql/net_serv.cc 2007-01-29 14:35:06 +01:00
@@ -609,7 +609,7 @@
thr_alarm(&alarmed,(uint) net->write_timeout,&alarm_buff);
#else
alarmed=0;
- vio_timeout(net->vio, 1, net->write_timeout);
+ /* Write timeout is set in net_set_write_timeout */
#endif /* NO_ALARM */
pos=(char*) packet; end=pos+len;
@@ -802,7 +802,7 @@
if (net_blocking)
thr_alarm(&alarmed,net->read_timeout,&alarm_buff);
#else
- vio_timeout(net->vio, 0, net->read_timeout);
+ /* Read timeout is set in net_set_read_timeout */
#endif /* NO_ALARM */
pos = net->buff + net->where_b; /* net->packet -4 */
@@ -1113,3 +1113,26 @@
return len;
}
+
+void net_set_read_timeout(NET *net, uint timeout)
+{
+ DBUG_ENTER("net_set_read_timeout");
+ DBUG_PRINT("enter", ("timeout: %d", timeout));
+ net->read_timeout= timeout;
+#ifdef NO_ALARM
+ vio_timeout(net->vio, 0, timeout);
+#endif
+ DBUG_VOID_RETURN;
+}
+
+
+void net_set_write_timeout(NET *net, uint timeout)
+{
+ DBUG_ENTER("net_set_write_timeout");
+ DBUG_PRINT("enter", ("timeout: %d", timeout));
+ net->write_timeout= timeout;
+#ifdef NO_ALARM
+ vio_timeout(net->vio, 1, timeout);
+#endif
+ DBUG_VOID_RETURN;
+}
--- 1.302/sql/slave.cc 2007-01-12 12:24:34 +01:00
+++ 1.303/sql/slave.cc 2007-01-29 14:35:06 +01:00
@@ -1421,7 +1421,6 @@
*/
thd->variables.max_allowed_packet= global_system_variables.max_allowed_packet
+ MAX_LOG_EVENT_HEADER; /* note, incr over the global not session var */
- thd->net.read_timeout = slave_net_timeout;
thd->slave_thread = 1;
set_slave_thread_options(thd);
thd->client_capabilities = CLIENT_LOCAL_FILES;
--- 1.619/sql/sql_parse.cc 2007-01-19 00:02:56 +01:00
+++ 1.620/sql/sql_parse.cc 2007-01-29 14:35:06 +01:00
@@ -1007,7 +1007,7 @@
return(ER_HANDSHAKE_ERROR);
}
DBUG_PRINT("info", ("IO layer change in progress..."));
- if (sslaccept(ssl_acceptor_fd, net->vio, thd->variables.net_wait_timeout))
+ if (sslaccept(ssl_acceptor_fd, net->vio, net->read_timeout))
{
DBUG_PRINT("error", ("Failed to accept new SSL connection"));
inc_host_errors(&thd->remote.sin_addr);
@@ -1036,7 +1036,6 @@
if ((thd->client_capabilities & CLIENT_TRANSACTIONS) &&
opt_using_transactions)
net->return_status= &thd->server_status;
- net->read_timeout=(uint) thd->variables.net_read_timeout;
char *user= end;
char *passwd= strend(user)+1;
@@ -1183,6 +1182,10 @@
Security_context *sctx= thd->security_ctx;
net->no_send_error= 0;
+ /* Use "connect_timeout" value during connection phase */
+ net_set_read_timeout(net, connect_timeout);
+ net_set_write_timeout(net, connect_timeout);
+
if ((error=check_connection(thd)))
{ // Wrong permissions
if (error > 0)
@@ -1225,6 +1228,10 @@
thd->init_for_queries();
}
+ /* Connect completed, set read/write timeouts back to tdefault */
+ net_set_read_timeout(net, thd->variables.net_read_timeout);
+ net_set_write_timeout(net, thd->variables.net_write_timeout);
+
while (!net->error && net->vio != 0 &&
!(thd->killed == THD::KILL_CONNECTION))
{
@@ -1556,7 +1563,7 @@
#ifndef EMBEDDED_LIBRARY
/*
- Read one command from socket and execute it (query or simple command).
+ Read one command from connection and execute it (query or simple command).
This function is called in loop from thread function.
SYNOPSIS
do_command()
@@ -1567,24 +1574,26 @@
bool do_command(THD *thd)
{
- char *packet;
- uint old_timeout;
+ char *packet= 0;
ulong packet_length;
- NET *net;
+ NET *net= &thd->net;
enum enum_server_command command;
DBUG_ENTER("do_command");
- net= &thd->net;
/*
indicator of uninitialized lex => normal flow of errors handling
(see my_message_sql)
*/
thd->lex->current_select= 0;
- packet=0;
- old_timeout=net->read_timeout;
- /* Wait max for 8 hours */
- net->read_timeout=(uint) thd->variables.net_wait_timeout;
+ /*
+ This thread will do a blocking read from the client which
+ will be interrupted when the next command is received from
+ the client, the connection is closed or "net_wait_timeout"
+ number of seconds has passed
+ */
+ net_set_read_timeout(net, thd->variables.net_wait_timeout);
+
thd->clear_error(); // Clear error message
net_new_transaction(net);
@@ -1613,7 +1622,10 @@
vio_description(net->vio), command,
command_name[command].str));
}
- net->read_timeout=old_timeout; // restore it
+
+ /* Restore read timeout value */
+ net_set_read_timeout(net, thd->variables.net_read_timeout);
+
/*
packet_length contains length of data, as it was stored in packet
header. In case of malformed header, packet_length can be zero.
--- 1.122/sql-common/client.c 2007-01-10 11:06:19 +01:00
+++ 1.123/sql-common/client.c 2007-01-29 14:35:06 +01:00
@@ -2044,11 +2044,17 @@
goto error;
}
vio_keepalive(net->vio,TRUE);
- /* Override local client variables */
+
+ /* If user set read_timeout, let it override the default */
if (mysql->options.read_timeout)
net->read_timeout= mysql->options.read_timeout;
+ vio_timeout(net->vio, 0, net->read_timeout);
+
+ /* If user set write_timeout, let it override the default */
if (mysql->options.write_timeout)
net->write_timeout= mysql->options.write_timeout;
+ vio_timeout(net->vio, 1, net->write_timeout);
+
if (mysql->options.max_allowed_packet)
net->max_packet_size= mysql->options.max_allowed_packet;
--- 1.211/sql/set_var.cc 2007-01-17 19:45:39 +01:00
+++ 1.212/sql/set_var.cc 2007-01-29 14:35:06 +01:00
@@ -1221,14 +1221,14 @@
static void fix_net_read_timeout(THD *thd, enum_var_type type)
{
if (type != OPT_GLOBAL)
- thd->net.read_timeout=thd->variables.net_read_timeout;
+ net_set_read_timeout(&thd->net, thd->variables.net_read_timeout);
}
static void fix_net_write_timeout(THD *thd, enum_var_type type)
{
if (type != OPT_GLOBAL)
- thd->net.write_timeout=thd->variables.net_write_timeout;
+ net_set_write_timeout(&thd->net, thd->variables.net_write_timeout);
}
static void fix_net_retry_count(THD *thd, enum_var_type type)
--- 1.70/sql/repl_failsafe.cc 2006-12-31 01:06:35 +01:00
+++ 1.71/sql/repl_failsafe.cc 2007-01-29 14:35:06 +01:00
@@ -57,6 +57,7 @@
functions like register_slave()) are working.
*/
+#if NOT_USED
static int init_failsafe_rpl_thread(THD* thd)
{
DBUG_ENTER("init_failsafe_rpl_thread");
@@ -98,7 +99,7 @@
thd->set_time();
DBUG_RETURN(0);
}
-
+#endif
void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status)
{
@@ -572,12 +573,14 @@
}
+#if NOT_USED
int find_recovery_captain(THD* thd, MYSQL* mysql)
{
return 0;
}
+#endif
-
+#if NOT_USED
pthread_handler_t handle_failsafe_rpl(void *arg)
{
DBUG_ENTER("handle_failsafe_rpl");
@@ -625,7 +628,7 @@
pthread_exit(0);
DBUG_RETURN(0);
}
-
+#endif
bool show_slave_hosts(THD* thd)
{
--- 1.159/sql/sql_repl.cc 2006-12-31 01:06:36 +01:00
+++ 1.160/sql/sql_repl.cc 2007-01-29 14:35:06 +01:00
@@ -92,8 +92,8 @@
The client might be slow loading the data, give him wait_timeout to do
the job
*/
- old_timeout = thd->net.read_timeout;
- thd->net.read_timeout = thd->variables.net_wait_timeout;
+ old_timeout= net->read_timeout;
+ net_set_read_timeout(net, thd->variables.net_wait_timeout);
/*
We need net_flush here because the client will not know it needs to send
@@ -137,7 +137,7 @@
error = 0;
err:
- thd->net.read_timeout = old_timeout;
+ net_set_read_timeout(net, old_timeout);
if (fd >= 0)
(void) my_close(fd, MYF(0));
if (errmsg)
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2429) | msvensson | 29 Jan |
