diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2004-12-22 22:48:31 +0100 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2004-12-22 22:48:31 +0100 |
| commit | ed3e1bb0065d2b694bb220517084771d29163b89 (patch) | |
| tree | f15242435300cc8a1a63c1defb3c39f2e4cf0307 /sql/mysqld.cc | |
| parent | beb2c1d909a1001ea5e70bde7bbb6a926e6530bd (diff) | |
| parent | 263832da6547abda093e49fbf2c773b31722adb1 (diff) | |
| download | mariadb-git-ed3e1bb0065d2b694bb220517084771d29163b89.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5cd85113641..e6e079d3deb 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -53,7 +53,7 @@ #endif #ifdef HAVE_NDBCLUSTER_DB #define OPT_NDBCLUSTER_DEFAULT 0 -#ifdef NDB_SHM_TRANSPORTER +#if defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000 #define OPT_NDB_SHM_DEFAULT 1 #else #define OPT_NDB_SHM_DEFAULT 0 |