diff options
| author | unknown <lars@mysql.com> | 2005-07-13 02:13:04 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-07-13 02:13:04 +0200 |
| commit | 8daa1c422927964741c2977aea50567558d5f607 (patch) | |
| tree | 288cefd45b67649d427ee7a8a02969119055a4a4 /sql/net_serv.cc | |
| parent | 1c8ef0cbd025557fc34f02d9a8cc99a392579141 (diff) | |
| parent | 73fd169d0215700583f335c6e42243e3fa1553c4 (diff) | |
| download | mariadb-git-8daa1c422927964741c2977aea50567558d5f607.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/mysql-5.0
BitKeeper/etc/config:
Auto merged
include/my_global.h:
Auto merged
sql/des_key_file.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
sql/log.cc:
Manual merge
sql/slave.cc:
Manual merge
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; |