Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
2200a496
Commit
2200a496
authored
Jan 19, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
parents
8c53cfd1
629f9337
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
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.
ndb/include/util/ndb_opts.h
View file @
2200a496
...
@@ -34,11 +34,11 @@ OPT_NDB_OPTIMIZED_NODE_SELECTION
...
@@ -34,11 +34,11 @@ OPT_NDB_OPTIMIZED_NODE_SELECTION
#define OPT_NDB_CONNECTSTRING 'c'
#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
#define OPT_NDB_SHM_DEFAULT 1
//
#else
#else
#define OPT_NDB_SHM_DEFAULT 0
#define OPT_NDB_SHM_DEFAULT 0
//
#endif
#endif
#define NDB_STD_OPTS_COMMON \
#define NDB_STD_OPTS_COMMON \
{ "usage", '?', "Display this help and exit.", \
{ "usage", '?', "Display this help and exit.", \
...
...
sql/mysqld.cc
View file @
2200a496
...
@@ -54,11 +54,11 @@
...
@@ -54,11 +54,11 @@
#endif
#endif
#ifdef HAVE_NDBCLUSTER_DB
#ifdef HAVE_NDBCLUSTER_DB
#define OPT_NDBCLUSTER_DEFAULT 0
#define OPT_NDBCLUSTER_DEFAULT 0
//#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
#define OPT_NDB_SHM_DEFAULT 1
//
#else
#else
#define OPT_NDB_SHM_DEFAULT 0
#define OPT_NDB_SHM_DEFAULT 0
//
#endif
#endif
#else
#else
#define OPT_NDBCLUSTER_DEFAULT 0
#define OPT_NDBCLUSTER_DEFAULT 0
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment