1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Resolving of conflicts from pull

This commit is contained in:
hf@bison.(none)
2002-06-17 17:14:20 +05:00
17 changed files with 640 additions and 313 deletions

View File

@ -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 *