diff options
author | unknown <hf@genie.(none)> | 2002-10-07 15:38:07 +0500 |
---|---|---|
committer | unknown <hf@genie.(none)> | 2002-10-07 15:38:07 +0500 |
commit | 200e15588d160d6fb51da3c34f5ad11faccb476b (patch) | |
tree | fbfc224eeed4a74ac5f2b5ede3bfe93330151a2d /include/violite.h | |
parent | 72a3c80dbb131339406ec4a815f423a1bd8926cc (diff) | |
parent | 77176c2dca23c755e4c70b267abefe1c65540608 (diff) | |
download | mariadb-git-200e15588d160d6fb51da3c34f5ad11faccb476b.tar.gz |
Huge pull
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe:
Auto merged
BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6:
Auto merged
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/lib_vio.c:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'include/violite.h')
-rw-r--r-- | include/violite.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index f4f40dcb64b..6f525a362ea 100644 --- a/include/violite.h +++ b/include/violite.h @@ -31,8 +31,13 @@ extern "C" { #endif /* __cplusplus */ -enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, - VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL}; +enum enum_vio_type { + VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, + VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL +#ifdef EMBEDDED_LIBRARY + ,VIO_SHARED_MEMORY, VIO_BUFFER +#endif +}; #ifndef __WIN__ #define HANDLE void * |