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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
a7c56a85 · tomas@poseidon.ndb.mysql.com · e906e861 · aabe1102 · a7c56a85 · a7c56a85
Commit a7c56a85 authored Jan 18, 2005 by tomas@poseidon.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

ndb/include/util/ndb_opts.h ndb/include/util/ndb_opts.h +4 -4

sql/mysqld.cc sql/mysqld.cc +4 -4

No files found.
--- a/ndb/include/util/ndb_opts.h
+++ b/ndb/include/util/ndb_opts.h
@@ -34,11 +34,11 @@ OPT_NDB_OPTIMIZED_NODE_SELECTION

 #define OPT_NDB_CONNECTSTRING 'c'

-#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
-#define OPT_NDB_SHM_DEFAULT 1
-#else
+//#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
+//#define OPT_NDB_SHM_DEFAULT 1
+//#else
 #define OPT_NDB_SHM_DEFAULT 0
-#endif
+//#endif

 #define NDB_STD_OPTS_COMMON \
  { "usage", '?', "Display this help and exit.", \

--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -54,11 +54,11 @@
 #endif
 #ifdef HAVE_NDBCLUSTER_DB
 #define OPT_NDBCLUSTER_DEFAULT 0
-#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
-#define OPT_NDB_SHM_DEFAULT 1
-#else
+//#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
+//#define OPT_NDB_SHM_DEFAULT 1
+//#else
 #define OPT_NDB_SHM_DEFAULT 0
-#endif
+//#endif
 #else
 #define OPT_NDBCLUSTER_DEFAULT 0
 #endif