Skip to content

M
mariadb
Commit e07b3d46 authored by unknown's avatar unknown
Browse files
Options

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
parents 09aa1e07 a66d80d1
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
ndb/include/util/ndb_opts.h
View file @ e07b3d46
...@@ -34,11 +34,11 @@ OPT_NDB_OPTIMIZED_NODE_SELECTION ...@@ -34,11 +34,11 @@ OPT_NDB_OPTIMIZED_NODE_SELECTION
#define OPT_NDB_CONNECTSTRING 'c' #define OPT_NDB_CONNECTSTRING 'c'
#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000 //#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
#define OPT_NDB_SHM_DEFAULT 1 //#define OPT_NDB_SHM_DEFAULT 1
#else //#else
#define OPT_NDB_SHM_DEFAULT 0 #define OPT_NDB_SHM_DEFAULT 0
#endif //#endif
#define NDB_STD_OPTS_COMMON \ #define NDB_STD_OPTS_COMMON \
{ "usage", '?', "Display this help and exit.", \ { "usage", '?', "Display this help and exit.", \
......
sql/mysqld.cc
View file @ e07b3d46
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
#endif #endif
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
#define OPT_NDBCLUSTER_DEFAULT 0 #define OPT_NDBCLUSTER_DEFAULT 0
#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000 //#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
#define OPT_NDB_SHM_DEFAULT 1 //#define OPT_NDB_SHM_DEFAULT 1
#else //#else
#define OPT_NDB_SHM_DEFAULT 0 #define OPT_NDB_SHM_DEFAULT 0
#endif //#endif
#else #else
#define OPT_NDBCLUSTER_DEFAULT 0 #define OPT_NDBCLUSTER_DEFAULT 0
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7