summaryrefslogtreecommitdiff
path: root/vio/viosocket.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-01-17 09:11:20 +0100
committerSergei Golubchik <sergii@pisem.net>2012-01-17 09:11:20 +0100
commit1433621c14e480dbedf3d7ea2b4885cff94bc6e5 (patch)
tree1c7e1a241c115c731fc91debcdc6fa714c931a7a /vio/viosocket.c
parent8b278b44154009168e4bf7b377f5b21159c5dfb4 (diff)
downloadmariadb-git-1433621c14e480dbedf3d7ea2b4885cff94bc6e5.tar.gz
fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo)
client/CMakeLists.txt: 1. -rdynamic is a linker flag. 2. it should be used in all builds, not debug only libmysql/get_password.c: prefer a standard function, when possible (otherwise a plugin will need to load it from the client)
Diffstat (limited to 'vio/viosocket.c')
-rw-r--r--vio/viosocket.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c
index 9840891b69e..6a33937d4bd 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -692,9 +692,7 @@ my_bool vio_is_connected(Vio *vio)
void vio_timeout(Vio *vio, uint which, uint timeout)
{
#if defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO)
-#ifndef DBUG_OFF
int r;
-#endif
DBUG_ENTER("vio_timeout");
{