mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
New SET syntax & system variables.
Made a some new buffers thread specific and changeable. Resize of key_buffer. AUTO_COMMIT -> AUTOCOMMIT Fixed mutex bug in DROP DATABASE Fixed bug when using auto_increment as second part of a key where first part could include NULL. Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers. Don't write message to error log when slave reconnects becasue of timeout. Fixed possible update problem when using DELETE/UPDATE on small tables (In some cases we used index even if table scanning would be better) A lot of minior code cleanups
This commit is contained in:
@ -92,13 +92,17 @@ static int send_file(THD *thd)
|
||||
char buf[IO_SIZE]; // It's safe to alloc this
|
||||
DBUG_ENTER("send_file");
|
||||
|
||||
// the client might be slow loading the data, give him wait_timeout to do
|
||||
// the job
|
||||
old_timeout = thd->net.timeout;
|
||||
thd->net.timeout = thd->inactive_timeout;
|
||||
/*
|
||||
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;
|
||||
|
||||
// we need net_flush here because the client will not know it needs to send
|
||||
// us the file name until it has processed the load event entry
|
||||
/*
|
||||
We need net_flush here because the client will not know it needs to send
|
||||
us the file name until it has processed the load event entry
|
||||
*/
|
||||
if (net_flush(net) || (packet_len = my_net_read(net)) == packet_error)
|
||||
{
|
||||
errmsg = "while reading file name";
|
||||
@ -137,7 +141,7 @@ static int send_file(THD *thd)
|
||||
error = 0;
|
||||
|
||||
err:
|
||||
thd->net.timeout = old_timeout;
|
||||
thd->net.read_timeout = old_timeout;
|
||||
if (fd >= 0)
|
||||
(void) my_close(fd, MYF(0));
|
||||
if (errmsg)
|
||||
|
Reference in New Issue
Block a user