← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/conn.c

Committer: Brian Aker
Date: 2011-02-13 22:15:19 UTC
mfrom: (2165.1.6 drizzle-staging)
Revision ID: brian@tangent.org-20110213221519-7a1zyzo0vfpw9jbm

Merge Monty

files added:
support-files/drizzle7.pc.in

support-files/libdrizzle.pc.in

win32/libdrizzle.vcxproj

win32/libdrizzle.vcxproj.filters

files removed:
config/lint-source.am

config/make-lint.py

config/uncrustify.cfg

extra/clean_source.sh

extra/cpplint.py

extra/include.am

extra/run_cpplint.sh

m4/pandora_run_cpplint.m4

win32/alloca.c

win32/alloca.h

win32/libdrizzle.vcproj

win32/mingw

win32/mingw/errno.h

win32/mingw/poll.c

win32/mingw/poll.h

win32/poll.c

win32/poll.h

files renamed:
extra/mysql_password_hash.c => libdrizzle/mysql_password_hash.cc

files modified:
.bzrignore

Makefile.am

config/pandora-plugin

configure.ac

drizzled/algorithm/include.am

drizzled/include.am

drizzled/message/include.am

drizzled/util/include.am

examples/proxy.c

examples/server.c

examples/simple.c

examples/simple_multi.c

libdrizzle/common.h

libdrizzle/conn.c

libdrizzle/drizzle.c

libdrizzle/drizzle.h

libdrizzle/include.am

libdrizzle/structs.h

support-files/include.am

win32/config.h

win32/conn_uds.c

win32/drizzle.sln

win32/include.am

win32/windows/errno.h

Show diffs side-by-side

added added

removed removed

libdrizzle/conn.c

1319

1319

}

1320

1320

1321

1321

#if defined (_WIN32)

1322

unsigned long asyncmode = 1;

1323

ioctlsocket(con->fd, FIONBIO, &asyncmode);

1322

{

1323

unsigned long asyncmode;

1324

asyncmode= 1;

1325

ioctlsocket(con->fd, FIONBIO, &asyncmode);

1326

}

1324

1327

#else

1325

1328

ret= fcntl(con->fd, F_GETFL, 0);

1326

1329

if (ret == -1)

Older »