From aabe11028ac7ab450ee35ba172a9f8e470807f90 Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Tue, 18 Jan 2005 22:09:15 +0100
Subject: [PATCH] removed default usage of shared memory transporter as it is
 not verified on enough platforms

---
 ndb/include/util/ndb_opts.h | 8 ++++----
 sql/mysqld.cc               | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ndb/include/util/ndb_opts.h b/ndb/include/util/ndb_opts.h
index dc95149f706..689a6bbf806 100644
--- 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.", \
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ee59ed8c8a1..976e62492ce 100644
--- 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