diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-29 14:35:10 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-29 14:35:10 +0300 |
| commit | eb585f66154ef753989b88d08f36a72ddc4ce526 (patch) | |
| tree | 3c4b1e4833a4b5450e51d5b39a5d7092e3641442 /sql/mini_client.cc | |
| parent | 38b70f0608fbd8f5c3f25fba16c2887611311803 (diff) | |
| parent | 3c9524233bf4cac12ebd2ac432f8ce4cfe1b5dbc (diff) | |
| download | mariadb-git-eb585f66154ef753989b88d08f36a72ddc4ce526.tar.gz | |
merge fix
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 38b3c22b91b..6489685c923 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -243,7 +243,7 @@ static void mc_free_old_query(MYSQL *mysql) static int mc_sock_connect(my_socket s, const struct sockaddr *name, uint namelen, uint to) { -#if defined(__WIN__) || defined(OS2) +#if defined(__WIN__) || defined(OS2) || defined(__NETWARE__) return connect(s, (struct sockaddr*) name, namelen); #else int flags, res, s_err; |