summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-08-21 18:11:46 +0200
committerSergei Golubchik <serg@mariadb.org>2014-10-11 18:53:06 +0200
commit7f5e51b940d65cf541403a50af74163b9aed5cb8 (patch)
treee540d3cd4d678cd276a9d496490ac5e527f30a78 /include
parent57dd1f6f3fcbc7a46e1b3e71257987315f7aa687 (diff)
downloadmariadb-git-7f5e51b940d65cf541403a50af74163b9aed5cb8.tar.gz
MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)
remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
Diffstat (limited to 'include')
-rw-r--r--include/my_base.h2
-rw-r--r--include/my_global.h3
-rw-r--r--include/mysqld_default_groups.h3
3 files changed, 0 insertions, 8 deletions
diff --git a/include/my_base.h b/include/my_base.h
index cdf8e189031..a443b4d161c 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -159,8 +159,6 @@ enum ha_extra_function {
Ignore if the a tuple is not found, continue processing the
transaction and ignore that 'row'. Needed for idempotency
handling on the slave
-
- Currently only used by NDB storage engine. Partition handler ignores flag.
*/
HA_EXTRA_IGNORE_NO_KEY,
HA_EXTRA_NO_IGNORE_NO_KEY,
diff --git a/include/my_global.h b/include/my_global.h
index bec5fb027eb..4a1cc8c5b75 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1231,9 +1231,6 @@ static inline double rint(double x)
#undef HAVE_SMEM /* No shared memory */
#else
-#ifdef WITH_NDB_BINLOG
-#define HAVE_NDB_BINLOG 1
-#endif
#define HAVE_REPLICATION
#define HAVE_EXTERNAL_CLIENT
#endif /* EMBEDDED_LIBRARY */
diff --git a/include/mysqld_default_groups.h b/include/mysqld_default_groups.h
index 30dfdae1338..3bc82359787 100644
--- a/include/mysqld_default_groups.h
+++ b/include/mysqld_default_groups.h
@@ -1,7 +1,4 @@
const char *load_default_groups[]= {
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-"mysql_cluster",
-#endif
"mysqld", "server", MYSQL_BASE_VERSION,
"mariadb", MARIADB_BASE_VERSION,
"client-server",