diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-09 16:01:06 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-09 16:01:06 +0200 |
| commit | a0ed9744f3d12e16e0fa5e784a37f21d7a1d2faf (patch) | |
| tree | bace3e172eb9211454c99657fb4493bb3159d503 /include/my_global.h | |
| parent | 93cc6444ccad2ace36ba354cd96ffe8ede676761 (diff) | |
| parent | 85e02d693c10553fd15c1193865a7e6996545838 (diff) | |
| download | mariadb-git-a0ed9744f3d12e16e0fa5e784a37f21d7a1d2faf.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
the file is deleted anyway
include/my_global.h:
merder
myisam/ft_boolean_search.c:
huh?
mysql-test/r/fulltext.result:
use local
mysql-test/r/fulltext_cache.result:
ur
mysql-test/r/fulltext_left_join.result:
ur
mysql-test/r/fulltext_multi.result:
ur
mysql-test/r/fulltext_order_by.result:
ur
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 35b4ddcce16..5ba9b705660 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -454,8 +454,7 @@ typedef SOCKET_SIZE_TYPE size_socket; /* Some things that this system doesn't have */ #define ONLY_OWN_DATABASES /* We are using only databases by monty */ -#define NO_PISAM /* Not needed anymore */ -#define NO_MISAM /* Not needed anymore */ +#define HAVE_ISAM /* TO BE DELETED */ #define NO_HASH /* Not needed anymore */ #ifdef __WIN__ #define NO_DIR_LIBRARY /* Not standar dir-library */ @@ -655,6 +654,7 @@ typedef off_t os_off_t; #define socket_errno WSAGetLastError() #define SOCKET_EINTR WSAEINTR #define SOCKET_EAGAIN WSAEINPROGRESS +#define SOCKET_EWOULDBLOCK WSAEINPROGRESS #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE #elif defined(OS2) @@ -966,4 +966,13 @@ typedef union { #define statistic_add(V,C,L) (V)+=(C) #endif +/* Macros to make switching between C and C++ mode easier */ +#ifdef __cplusplus +#define C_MODE_START extern "C" { +#define C_MODE_END } +#else +#define C_MODE_START +#define C_MODE_END +#endif + #endif /* _global_h */ |