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

Pull conflicts resolutions

This commit is contained in:
hf@genie.(none)
2002-11-29 12:35:48 +04:00
27 changed files with 1785 additions and 371 deletions

View File

@ -32,7 +32,11 @@ extern "C" {
#endif /* __cplusplus */
enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET,
VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL,VIO_TYPE_SHARED_MEMORY};
VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL,VIO_TYPE_SHARED_MEMORY
#ifdef EMBEDDED_LIBRARY
, VIO_TYPE_BUFFER
#endif
};
#ifndef __WIN__
#define HANDLE void *