diff options
| author | unknown <joreland@mysql.com> | 2005-01-19 07:37:42 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-19 07:37:42 +0100 |
| commit | 7cbe4d19e4f152fcb5c7b0e2cb3da116132b8aef (patch) | |
| tree | f254fa19624bbd4b2781b2a8bf2cf8433c04a84e /ndb/include/util | |
| parent | 0eb1a8107f2b245b6bbcdc78d0a49a78996df3c9 (diff) | |
| parent | bfe74e69903583f1bb9b4ad803c137d6487afa74 (diff) | |
| download | mariadb-git-7cbe4d19e4f152fcb5c7b0e2cb3da116132b8aef.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
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 dc95149f706..9151aee6cf2 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' -#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000 +#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 |