summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2003-03-08 22:37:22 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2003-03-08 22:37:22 +0200
commitec6bd7a49a35e50f462dbbb85bada9bfbbb13682 (patch)
treef6db0ef1547d561f764eb9b54ca8d5934b35b4ac /libmysql
parentf5144a8a56d92faa19507c5bb3dac22100879425 (diff)
downloadmariadb-git-ec6bd7a49a35e50f462dbbb85bada9bfbbb13682.tar.gz
Additional bug fix
libmysql/libmysql.c: Additional fix for connection being established during select()
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 996d395776d..8a85df3c60f 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -207,6 +207,9 @@ static int connect2(my_socket s, const struct sockaddr *name, uint namelen,
errno = s_err;
return(-1); /* but return an error... */
}
+ if (res && result > 0)
+ result=res=0; // We did it in select() !!!
+
return((res) ? res : result); /* It's all good! */
#endif
}