diff options
| author | unknown <joreland@mysql.com> | 2005-01-01 14:01:37 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-01 14:01:37 +0100 |
| commit | 2a5aa24fabd90dff122a0f352bcc8befc5e58b8c (patch) | |
| tree | fb919d536a2a3d85dfc942c0b121c3748b223555 /ndb/include/util | |
| parent | a142cea8a35f7cfd8c2a3b4533f4cceca53e3179 (diff) | |
| parent | 9c92a25524183a88c46474bab10313eb8b9edbab (diff) | |
| download | mariadb-git-2a5aa24fabd90dff122a0f352bcc8befc5e58b8c.tar.gz | |
merge
configure.in:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
Diffstat (limited to 'ndb/include/util')
| -rw-r--r-- | ndb/include/util/ndb_opts.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/include/util/ndb_opts.h b/ndb/include/util/ndb_opts.h index 4bac36f5e5e..dc95149f706 100644 --- a/ndb/include/util/ndb_opts.h +++ b/ndb/include/util/ndb_opts.h @@ -34,7 +34,7 @@ OPT_NDB_OPTIMIZED_NODE_SELECTION #define OPT_NDB_CONNECTSTRING 'c' -#ifdef NDB_SHM_TRANSPORTER +#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000 #define OPT_NDB_SHM_DEFAULT 1 #else #define OPT_NDB_SHM_DEFAULT 0 |