Commit a8e52500 authored Jan 19, 2005 by unknown

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

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

parents 05422852 982e0b8c

ndb/include/util/ndb_opts.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -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(NOT_ENOUGH_TESTED) && 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.", \

sql/mysqld.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -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(NOT_ENOUGH_TESTED) && 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