1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


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
client/mysqlshow.c:
  Auto merged
isam/isamchk.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:
  Merged from 4.0.
This commit is contained in:
unknown
2005-12-04 15:34:47 +02:00
11 changed files with 13 additions and 10 deletions

View File

@@ -689,6 +689,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->host) // If TCP/IP connection
{