Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
69424ca9
Commit
69424ca9
authored
May 12, 2004
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
portability/autoconf fixes
parent
5a6ab9bd
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
56 additions
and
73 deletions
+56
-73
ndb/Defs.mk
ndb/Defs.mk
+5
-1
ndb/config/GuessConfig.sh
ndb/config/GuessConfig.sh
+5
-0
ndb/include/ndb_global.h
ndb/include/ndb_global.h
+7
-1
ndb/include/portlib/NdbTCP.h
ndb/include/portlib/NdbTCP.h
+15
-17
ndb/src/common/transporter/Makefile
ndb/src/common/transporter/Makefile
+3
-22
ndb/src/common/transporter/TransporterInternalDefinitions.hpp
...src/common/transporter/TransporterInternalDefinitions.hpp
+7
-28
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
+7
-3
ndb/src/kernel/ndb-main/Main.cpp
ndb/src/kernel/ndb-main/Main.cpp
+3
-1
ndb/test/src/HugoAsynchTransactions.cpp
ndb/test/src/HugoAsynchTransactions.cpp
+4
-0
No files found.
ndb/Defs.mk
View file @
69424ca9
...
...
@@ -53,7 +53,11 @@ SHLIBEXT := so
endif
ifeq
($(NDB_SCI), Y)
CCFLAGS_TOP
+=
-DHAVE_SCI
CCFLAGS_TOP
+=
-DHAVE_NDB_SCI
endif
ifeq
($(NDB_SHM), Y)
CCFLAGS_TOP
+=
-DHAVE_NDB_SHM
endif
ifneq
($(findstring OSE, $(NDB_OS)),)
...
...
ndb/config/GuessConfig.sh
View file @
69424ca9
...
...
@@ -11,6 +11,11 @@ then
NDB_SCI
=
N
fi
if
[
-z
"
$NDB_SHM
"
]
then
NDB_SHM
=
N
fi
os
=
`
uname
-s
`
case
$os
in
Linux
)
...
...
ndb/include/ndb_global.h
View file @
69424ca9
...
...
@@ -3,6 +3,13 @@
#define NDBGLOBAL_H
#include <my_global.h>
#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
#define NDB_WIN32
#else
#undef NDB_WIN32
#endif
#include <m_string.h>
#include <m_ctype.h>
#include <ndb_types.h>
...
...
@@ -31,7 +38,6 @@
#ifdef NDB_WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#include <windows.h>
#define DIR_SEPARATOR "\\"
#define PATH_MAX 256
...
...
ndb/include/portlib/NdbTCP.h
View file @
69424ca9
...
...
@@ -40,24 +40,8 @@ typedef int socklen_t;
#define InetErrno (* inet_errno())
#endif
#if defined NDB_SOLARIS || defined NDB_HPUX || defined NDB_IBMAIX || defined NDB_TRU64X || NDB_LINUX || defined NDB_MACOSX
/**
* Include files needed
*/
#include <netdb.h>
#define NDB_NONBLOCK O_NONBLOCK
#define NDB_SOCKET_TYPE int
#define NDB_INVALID_SOCKET -1
#define NDB_CLOSE_SOCKET(x) close(x)
#define InetErrno errno
#endif
#elif NDB_WIN32
#ifdef NDB_WIN32
/**
* Include files needed
*/
...
...
@@ -70,6 +54,20 @@ typedef int socklen_t;
#define NDB_INVALID_SOCKET INVALID_SOCKET
#define NDB_CLOSE_SOCKET(x) closesocket(x)
#else
/**
* Include files needed
*/
#include <netdb.h>
#define NDB_NONBLOCK O_NONBLOCK
#define NDB_SOCKET_TYPE int
#define NDB_INVALID_SOCKET -1
#define NDB_CLOSE_SOCKET(x) close(x)
#define InetErrno errno
#endif
#define NDB_SOCKLEN_T SOCKET_SIZE_TYPE
...
...
ndb/src/common/transporter/Makefile
View file @
69424ca9
...
...
@@ -20,37 +20,18 @@ DIRS := basictest perftest
CCFLAGS_LOC
+=
-I
$(
call
fixpath,
$(NDB_TOP)
/include/kernel
)
\
-I
$(
call
fixpath,
$(NDB_TOP)
/include/transporter
)
ifeq
($(NDB_SHM), Y)
ifeq
($(NDB_OS), WIN32)
SOURCES
+=
SHM_Transporter.win32.cpp
endif
ifeq
($(NDB_OS), SOLARIS)
else
SOURCES
+=
SHM_Transporter.unix.cpp
endif
ifeq
($(NDB_OS), HPUX)
SOURCES
+=
SHM_Transporter.unix.cpp
endif
ifeq
($(NDB_OS), MACOSX)
SOURCES
+=
SHM_Transporter.unix.cpp
endif
ifeq
($(NDB_OS), IBMAIX)
SOURCES
+=
SHM_Transporter.unix.cpp
endif
ifeq
($(NDB_OS), TRU64X)
SOURCES
+=
SHM_Transporter.unix.cpp
endif
ifeq
($(NDB_OS), LINUX)
SOURCES
+=
SHM_Transporter.unix.cpp
ifeq
($(NDB_SCI), Y)
SOURCES
+=
SCI_Transporter.cpp
endif
endif
ifneq
($(findstring OSE, $(NDB_OS)),)
SOURCES
+=
OSE_Transporter.cpp
...
...
ndb/src/common/transporter/TransporterInternalDefinitions.hpp
View file @
69424ca9
...
...
@@ -21,39 +21,18 @@
#include <NdbOut.hpp>
#endif
#ifdef NDB_SOLARIS
#define NDB_TCP_TRANSPORTER
//#define NDB_SCI_TRANSPORTER
#define NDB_SHM_TRANSPORTER
#elif defined NDB_OSE || defined NDB_SOFTOSE
#define NDB_TCP_TRANSPORTER
#define NDB_OSE_TRANSPORTER
#elif defined NDB_LINUX
#define NDB_TCP_TRANSPORTER
#define NDB_SCI_TRANSPORTER
#define NDB_SHM_TRANSPORTER
#elif defined NDB_WIN32
#define NDB_TCP_TRANSPORTER
#elif defined NDB_HPUX
#define NDB_TCP_TRANSPORTER
#define NDB_SHM_TRANSPORTER
#elif defined NDB_MACOSX
#define NDB_TCP_TRANSPORTER
#define NDB_SHM_TRANSPORTER
#elif defined NDB_IBMAIX
#define NDB_TCP_TRANSPORTER
#define NDB_SHM_TRANSPORTER
#elif defined NDB_TRU64X
#define NDB_TCP_TRANSPORTER
#ifdef HAVE_NDB_SHM
#define NDB_SHM_TRANSPORTER
#else
#error unsupported platform
#endif
#ifndef HAVE_SCI
#ifdef NDB_SCI_TRANSPORTER
#undef NDB_SCI_TRANSPORTER
#ifdef HAVE_NDB_SCI
#define NDB_SCI_TRANSPORTER
#endif
#ifdef HAVE_NDB_OSE
#define NDB_OSE_TRANSPORTER
#endif
#ifdef DEBUG_TRANSPORTER
...
...
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
View file @
69424ca9
...
...
@@ -854,7 +854,7 @@ int Ndbfs::translateErrno(int aErrno)
//no space left on device
case
ENFILE
:
case
EDQUOT
:
#if
ndef NDB_MACOSX
#if
def ENOSR
case
ENOSR
:
#endif
case
ENOSPC
:
...
...
@@ -872,12 +872,16 @@ int Ndbfs::translateErrno(int aErrno)
return
FsRef
::
fsErrInvalidParameters
;
//environment error
case
ELOOP
:
#if
ndef NDB_MACOSX
#if
def ENOLINK
case
ENOLINK
:
#endif
#ifdef EMULTIHOP
case
EMULTIHOP
:
#endif
#if
ndef NDB_LINUX
#if
def EOPNOTSUPP
case
EOPNOTSUPP
:
#endif
#ifdef ESPIPE
case
ESPIPE
:
#endif
case
EPIPE
:
...
...
ndb/src/kernel/ndb-main/Main.cpp
View file @
69424ca9
...
...
@@ -257,8 +257,10 @@ handler(int sig){
case
SIGINT
:
/* 2 - Interrupt */
case
SIGQUIT
:
/* 3 - Quit */
case
SIGTERM
:
/* 15 - Terminate */
#if
ndef NDB_MACOSX
#if
def SIGPWR
case
SIGPWR
:
/* 19 - Power fail */
#endif
#ifdef SIGPOLL
case
SIGPOLL
:
/* 22 */
#endif
case
SIGSTOP
:
/* 23 */
...
...
ndb/test/src/HugoAsynchTransactions.cpp
View file @
69424ca9
...
...
@@ -473,6 +473,10 @@ HugoAsynchTransactions::executeAsynchOperation(Ndb* pNdb,
}
}
break
;
case
NO_INSERT
:
case
NO_UPDATE
:
case
NO_DELETE
:
abort
();
}
// Close all transactions
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment