mirror of
https://github.com/MariaDB/server.git
synced 2026-05-08 08:04:29 +02:00
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 client/mysql.cc: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f: Auto merged client/mysqlshow.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged netware/mysql_test_run.c: Merged from 4.1.
This commit is contained in:
commit
e236de83bc
2 changed files with 7 additions and 0 deletions
|
|
@ -797,6 +797,9 @@ static int check_connection(THD *thd)
|
|||
|
||||
DBUG_PRINT("info",
|
||||
("New connection received on %s", vio_description(net->vio)));
|
||||
#ifdef SIGNAL_WITH_VIO_CLOSE
|
||||
thd->set_active_vio(net->vio);
|
||||
#endif
|
||||
|
||||
if (!thd->main_security_ctx.host) // If TCP/IP connection
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue