diff options
| author | lars@mysql.com <> | 2005-07-13 02:13:04 +0200 |
|---|---|---|
| committer | lars@mysql.com <> | 2005-07-13 02:13:04 +0200 |
| commit | 6db2602ad06b0e1ac483809df0c1fbe471634f3d (patch) | |
| tree | 288cefd45b67649d427ee7a8a02969119055a4a4 /sql/net_serv.cc | |
| parent | f19814bea652be03645820ac9ebac173c4118b85 (diff) | |
| parent | c31d71c065304b7cd1c237174da19a8d4270fb26 (diff) | |
| download | mariadb-git-6db2602ad06b0e1ac483809df0c1fbe471634f3d.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/mysql-5.0
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 44539ec2d74..9f6295f8a36 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -135,7 +135,7 @@ my_bool my_net_init(NET *net, Vio* vio) if (vio != 0) /* If real connection */ { net->fd = vio_fd(vio); /* For perl DBI/DBD */ -#if defined(MYSQL_SERVER) && !defined(___WIN__) && !defined(__EMX__) && !defined(OS2) +#if defined(MYSQL_SERVER) && !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) if (!(test_flags & TEST_BLOCKING)) { my_bool old_mode; |