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

.gitignore

@@ -205,7 +205,6 @@ support-files/mysql.10.0.11.spec
 support-files/mysql.server
 support-files/mysql.spec
 support-files/mysqld_multi.server
-support-files/ndb-config-2-node.ini
 support-files/wsrep.cnf
 support-files/wsrep_notify
 tags

BUILD/SETUP.sh

@@ -205,9 +205,8 @@ fi
 
 max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"
 max_no_qc_configs="$SSL_LIBRARY --with-plugins=max --without-query-cache"
-max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server --with-libevent"
 max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent"
-all_configs="$SSL_LIBRARY --with-plugins=max --with-plugin-ndbcluster --with-embedded-server --with-innodb_plugin --with-libevent"
+all_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-innodb_plugin --with-libevent"
 
 #
 # CPU and platform specific compilation flags.

BUILD/compile-amd64-debug-max-no-ndb

@@ -20,6 +20,6 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 extra_flags="$amd64_cflags $debug_cflags"
-extra_configs="$amd64_configs $debug_configs $max_no_ndb_configs"
+extra_configs="$amd64_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-amd64-gprof-no-ndb

@@ -2,6 +2,6 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 extra_flags="$amd64_cflags -pg -g"
-extra_configs="$amd64_configs $max_no_ndb_configs --disable-shared $static_link"
+extra_configs="$amd64_configs $max_configs --disable-shared $static_link"
 
 . "$path/FINISH.sh"

BUILD/compile-amd64-max-sci

@@ -1,23 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2007 MySQL AB
-# Use is subject to license terms 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-extra_flags="$amd64_cflags $fast_cflags -g"
-extra_configs="$amd64_configs $max_configs --with-ndb-sci=/opt/DIS"
-
-. "$path/FINISH.sh"

BUILD/compile-bintar

@@ -73,7 +73,7 @@ CC="gcc -static-libgcc" CXX="g++ -static-libgcc" CFLAGS="$FLAGS" CXXFLAGS="$FLAG
 	--without-docs --with-extra-charsets=all \
 	--with-libwrap --with-ssl --with-readline --with-libevent --with-zlib-dir=bundled \
 	--with-partition --with-embedded-server \
-	--with-plugins=max-no-ndb \
+	--with-plugins=max \
 	--without-plugin-innodb_plugin
 
 make $AM_MAKEFLAGS

BUILD/compile-dist

@@ -78,5 +78,5 @@ fi
 ./configure \
   --with-embedded-server \
   --with-perfschema \
-  --with-plugins=max-no-ndb
+  --with-plugins=max
 $gmake -j4

BUILD/compile-ndb-autotest

@@ -1,24 +0,0 @@
-#! /bin/sh
-
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags='-DERROR_INSERT'"
-extra_flags="$fast_cflags $max_cflags -g"
-
-. "$path/FINISH.sh"

BUILD/compile-pentium-debug-max-no-ndb

@@ -19,6 +19,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs"
+extra_configs="$pentium_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-valgrind-max-no-ndb

@@ -21,6 +21,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
-extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_no_ndb_configs"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium64-max-sci

@@ -1,25 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2007 MySQL AB
-#  Use is subject to license terms
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_flags="$pentium64_cflags $fast_cflags -g"
-extra_configs="$pentium_configs $max_configs --with-ndb-sci=/opt/DIS"
-
-. "$path/FINISH.sh"

BUILD/compile-ppc-debug-max-no-ndb

@@ -20,6 +20,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$ppc_cflags $debug_cflags"
-extra_configs="$debug_configs $max_no_ndb_configs"
+extra_configs="$debug_configs $max_configs"
 
 . "$path/FINISH.sh"

CMakeLists.txt

@@ -404,12 +404,6 @@ IF(NOT WITHOUT_SERVER)
   ADD_SUBDIRECTORY(mysql-test)
   ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
   ADD_SUBDIRECTORY(sql-bench)
-
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-    ADD_SUBDIRECTORY(internal)
-  ENDIF()
-  ADD_SUBDIRECTORY(packaging/rpm-uln)
-  ADD_SUBDIRECTORY(packaging/rpm-oel)
 ENDIF()
 
 IF(UNIX)

client/mysql.cc

@@ -590,8 +590,6 @@ static COMMANDS commands[] = {
   { "NAMES", 0, 0, 0, ""},
   { "NATIONAL", 0, 0, 0, ""},
   { "NATURAL", 0, 0, 0, ""},
-  { "NDB", 0, 0, 0, ""},
-  { "NDBCLUSTER", 0, 0, 0, ""},
   { "NCHAR", 0, 0, 0, ""},
   { "NEW", 0, 0, 0, ""},
   { "NEXT", 0, 0, 0, ""},

client/mysqltest.cc

@@ -4740,10 +4740,6 @@ void do_sync_with_master(struct st_command *command)
 }
 
 
-/*
-  when ndb binlog is on, this call will wait until last updated epoch
-  (locally in the mysqld) has been received into the binlog
-*/
 int do_save_master_pos()
 {
   MYSQL_RES *res;
@@ -4752,144 +4748,6 @@ int do_save_master_pos()
   const char *query;
   DBUG_ENTER("do_save_master_pos");
 
-#ifdef HAVE_NDB_BINLOG
-  /*
-    Wait for ndb binlog to be up-to-date with all changes
-    done on the local mysql server
-  */
-  {
-    ulong have_ndbcluster;
-    if (mysql_query(mysql, query= "show variables like 'have_ndbcluster'"))
-      die("'%s' failed: %d %s", query,
-          mysql_errno(mysql), mysql_error(mysql));
-    if (!(res= mysql_store_result(mysql)))
-      die("mysql_store_result() returned NULL for '%s'", query);
-    if (!(row= mysql_fetch_row(res)))
-      die("Query '%s' returned empty result", query);
-
-    have_ndbcluster= strcmp("YES", row[1]) == 0;
-    mysql_free_result(res);
-
-    if (have_ndbcluster)
-    {
-      ulonglong start_epoch= 0, handled_epoch= 0,
-	latest_epoch=0, latest_trans_epoch=0,
-	latest_handled_binlog_epoch= 0, latest_received_binlog_epoch= 0,
-	latest_applied_binlog_epoch= 0;
-      int count= 0;
-      int do_continue= 1;
-      while (do_continue)
-      {
-        const char binlog[]= "binlog";
-	const char latest_epoch_str[]=
-          "latest_epoch=";
-        const char latest_trans_epoch_str[]=
-          "latest_trans_epoch=";
-	const char latest_received_binlog_epoch_str[]=
-	  "latest_received_binlog_epoch";
-        const char latest_handled_binlog_epoch_str[]=
-          "latest_handled_binlog_epoch=";
-        const char latest_applied_binlog_epoch_str[]=
-          "latest_applied_binlog_epoch=";
-        if (count)
-          my_sleep(100*1000); /* 100ms */
-        if (mysql_query(mysql, query= "show engine ndb status"))
-          die("failed in '%s': %d %s", query,
-              mysql_errno(mysql), mysql_error(mysql));
-        if (!(res= mysql_store_result(mysql)))
-          die("mysql_store_result() returned NULL for '%s'", query);
-        while ((row= mysql_fetch_row(res)))
-        {
-          if (strcmp(row[1], binlog) == 0)
-          {
-            const char *status= row[2];
-
-	    /* latest_epoch */
-	    while (*status && strncmp(status, latest_epoch_str,
-				      sizeof(latest_epoch_str)-1))
-	      status++;
-	    if (*status)
-            {
-	      status+= sizeof(latest_epoch_str)-1;
-	      latest_epoch= strtoull(status, (char**) 0, 10);
-	    }
-	    else
-	      die("result does not contain '%s' in '%s'",
-		  latest_epoch_str, query);
-	    /* latest_trans_epoch */
-	    while (*status && strncmp(status, latest_trans_epoch_str,
-				      sizeof(latest_trans_epoch_str)-1))
-	      status++;
-	    if (*status)
-	    {
-	      status+= sizeof(latest_trans_epoch_str)-1;
-	      latest_trans_epoch= strtoull(status, (char**) 0, 10);
-	    }
-	    else
-	      die("result does not contain '%s' in '%s'",
-		  latest_trans_epoch_str, query);
-	    /* latest_received_binlog_epoch */
-	    while (*status &&
-		   strncmp(status, latest_received_binlog_epoch_str,
-			   sizeof(latest_received_binlog_epoch_str)-1))
-	      status++;
-	    if (*status)
-	    {
-	      status+= sizeof(latest_received_binlog_epoch_str)-1;
-	      latest_received_binlog_epoch= strtoull(status, (char**) 0, 10);
-	    }
-	    else
-	      die("result does not contain '%s' in '%s'",
-		  latest_received_binlog_epoch_str, query);
-	    /* latest_handled_binlog */
-	    while (*status &&
-		   strncmp(status, latest_handled_binlog_epoch_str,
-			   sizeof(latest_handled_binlog_epoch_str)-1))
-	      status++;
-	    if (*status)
-	    {
-	      status+= sizeof(latest_handled_binlog_epoch_str)-1;
-	      latest_handled_binlog_epoch= strtoull(status, (char**) 0, 10);
-	    }
-	    else
-	      die("result does not contain '%s' in '%s'",
-		  latest_handled_binlog_epoch_str, query);
-	    /* latest_applied_binlog_epoch */
-	    while (*status &&
-		   strncmp(status, latest_applied_binlog_epoch_str,
-			   sizeof(latest_applied_binlog_epoch_str)-1))
-	      status++;
-	    if (*status)
-	    {
-	      status+= sizeof(latest_applied_binlog_epoch_str)-1;
-	      latest_applied_binlog_epoch= strtoull(status, (char**) 0, 10);
-	    }
-	    else
-	      die("result does not contain '%s' in '%s'",
-		  latest_applied_binlog_epoch_str, query);
-	    if (count == 0)
-	      start_epoch= latest_trans_epoch;
-	    break;
-	  }
-	}
-	if (!row)
-	  die("result does not contain '%s' in '%s'",
-	      binlog, query);
-	if (latest_handled_binlog_epoch > handled_epoch)
-	  count= 0;
-	handled_epoch= latest_handled_binlog_epoch;
-	count++;
-	if (latest_handled_binlog_epoch >= start_epoch)
-          do_continue= 0;
-        else if (count > 300) /* 30s */
-	{
-	  break;
-        }
-        mysql_free_result(res);
-      }
-    }
-  }
-#endif
   if (mysql_query(mysql, query= "show master status"))
     die("failed in 'show master status': %d %s",
 	mysql_errno(mysql), mysql_error(mysql));

cmake/make_dist.cmake.in

@@ -116,15 +116,6 @@ CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.h
 CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
    ${PACKAGE_DIR}/sql/sql_yacc.cc COPYONLY)
 
-# Copy spec files
-SET(SPECFILENAME "mysql.${VERSION}.spec")
-IF("${VERSION}" MATCHES "-ndb-")
-  STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
-  SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec")
-ENDIF()
-CONFIGURE_FILE(${CMAKE_BINARY_DIR}/support-files/${SPECFILENAME}
-   ${PACKAGE_DIR}/support-files/${SPECFILENAME} COPYONLY)
-
 # Add documentation, if user has specified where to find them
 IF(MYSQL_DOCS_LOCATION)
   MESSAGE("Copying documentation files from " ${MYSQL_DOCS_LOCATION})

cmake/mysql_version.cmake

@@ -59,10 +59,6 @@ IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
   MESSAGE(STATUS "MariaDB ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
-  # Use NDBVERSION irregardless of whether this is Cluster or not, if not
-  # then the regex will be ignored anyway.
-  STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
-  STRING(REPLACE "-" "_" MYSQL_RPM_VERSION "${NDBVERSION}")
   MATH(EXPR MYSQL_VERSION_ID "10000*${MAJOR_VERSION} + 100*${MINOR_VERSION} + ${PATCH_VERSION}")
   MARK_AS_ADVANCED(VERSION MYSQL_VERSION_ID MYSQL_BASE_VERSION)
   SET(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})
@@ -93,10 +89,6 @@ ENDIF()
 
 IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
   SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${VERSION}")
-  IF("${VERSION}" MATCHES "-ndb-")
-    STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
-    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mysql-cluster-gpl-${NDBVERSION}")
-  ENDIF()
 ENDIF()
 SET(CPACK_PACKAGE_CONTACT "MariaDB team <info@montyprogram.com>")
 SET(CPACK_PACKAGE_VENDOR "Monty Program AB")

cmake/package_name.cmake

@@ -126,12 +126,7 @@ IF(NOT VERSION)
     SET(PRODUCT_TAG)
   ENDIF()
 
-  IF("${VERSION}" MATCHES "-ndb-")
-    STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
-    SET(package_name "mysql-cluster${PRODUCT_TAG}-${NDBVERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
-  ELSE()
-    SET(package_name "mariadb${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
-  ENDIF()
+  SET(package_name "mariadb${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
 
   MESSAGE(STATUS "Packaging as: ${package_name}")
 

config.h.cmake

@@ -604,10 +604,6 @@
 #cmakedefine WITH_CSV_STORAGE_ENGINE 1
 #cmakedefine WITH_PARTITION_STORAGE_ENGINE 1
 #cmakedefine WITH_PERFSCHEMA_STORAGE_ENGINE 1
-#cmakedefine WITH_NDBCLUSTER_STORAGE_ENGINE 1
-#if (WITH_NDBCLUSTER_STORAGE_ENGINE) && !defined(EMBEDDED_LIBRARY)
-# define HAVE_NDB_BINLOG 1
-#endif
 #cmakedefine WITH_ARIA_STORAGE_ENGINE 1
 #cmakedefine USE_ARIA_FOR_TMP_TABLES 1
 

debian/README.Maintainer

@@ -45,9 +45,6 @@ debhelper (>=4.1.16):
 autoconf (>= 2.13-20), automake1.7
 	Try to get rid of them.
 
-doxygen, tetex-bin, tetex-extra, gs
-	for ndb/docs/*tex
-
 #
 # Remarks to the start scripts
 #

debian/mariadb-server-10.1.mysql.init

@@ -108,7 +108,7 @@ case "${1:-''}" in
 	    # Start MariaDB! 
   	    /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 &
 
-	    # 6s was reported in #352070 to be too few when using ndbcluster
+	    # 6s was reported in #352070 to be too little
 	    for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do
                 sleep 1
 	        if mysqld_status check_alive nowarn ; then break; fi

debian/mariadb-server-10.1.preinst

@@ -48,18 +48,6 @@ stop_server() {
 
 this_version=10.1
 
-# Abort if an NDB cluster is in use.
-if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /etc/mysql/; then
-  db_fset mysql-server/no_upgrade_when_using_ndb seen false || true
-  db_input high mysql-server/no_upgrade_when_using_ndb || true
-  db_go
-  db_stop
-  exit 1
-fi
-
-# Abort if skip-bdb option is enabled, required for 5.0 -> 5.1 upgrades.
-#TODO
-
 # Safe the user from stupidities.
 show_downgrade_warning=0
 for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do

debian/mariadb-server-10.1.templates

@@ -81,9 +81,3 @@ Type: error
 _Description: Password input error
  The two passwords you entered were not the same. Please try again.
 
-Template: mysql-server/no_upgrade_when_using_ndb
-Type: error
-_Description: NDB Cluster seems to be in use
- MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new
- mysql-cluster package and remove all lines starting with "ndb" from
- all config files below /etc/mysql/.

debian/mariadb-test-10.1.dirs

@@ -19,9 +19,6 @@ usr/share/mysql/mysql-test/suite/parts
 usr/share/mysql/mysql-test/suite/parts/inc
 usr/share/mysql/mysql-test/suite/parts/t
 usr/share/mysql/mysql-test/suite/parts/r
-usr/share/mysql/mysql-test/suite/rpl_ndb
-usr/share/mysql/mysql-test/suite/rpl_ndb/t
-usr/share/mysql/mysql-test/suite/rpl_ndb/r
 usr/share/mysql/mysql-test/suite/bugs
 usr/share/mysql/mysql-test/suite/bugs/t
 usr/share/mysql/mysql-test/suite/bugs/r
@@ -46,9 +43,6 @@ usr/share/mysql/mysql-test/suite/jp/t
 usr/share/mysql/mysql-test/suite/jp/r
 usr/share/mysql/mysql-test/suite/jp/include
 usr/share/mysql/mysql-test/suite/jp/std_data
-usr/share/mysql/mysql-test/suite/ndb
-usr/share/mysql/mysql-test/suite/ndb/t
-usr/share/mysql/mysql-test/suite/ndb/r
 usr/share/mysql/mysql-test/suite/maria
 usr/share/mysql/mysql-test/suite/maria/t
 usr/share/mysql/mysql-test/suite/maria/r
@@ -63,9 +57,6 @@ usr/share/mysql/mysql-test/suite/binlog
 usr/share/mysql/mysql-test/suite/binlog/t
 usr/share/mysql/mysql-test/suite/binlog/r
 usr/share/mysql/mysql-test/suite/binlog/std_data
-usr/share/mysql/mysql-test/suite/ndb_team
-usr/share/mysql/mysql-test/suite/ndb_team/t
-usr/share/mysql/mysql-test/suite/ndb_team/r
 usr/share/mysql/mysql-test/suite/federated
 usr/share/mysql/mysql-test/suite/funcs_1
 usr/share/mysql/mysql-test/suite/funcs_1/cursors
@@ -87,9 +78,5 @@ usr/share/mysql/mysql-test/suite/oqgraph/t
 usr/share/mysql/mysql-test/suite/oqgraph/r
 usr/share/mysql/mysql-test/suite/oqgraph/include
 usr/share/mysql/mysql-test/std_data
-usr/share/mysql/mysql-test/std_data/ndb_backup50
 usr/share/mysql/mysql-test/std_data/parts
-usr/share/mysql/mysql-test/std_data/ndb_backup51_data_le
-usr/share/mysql/mysql-test/std_data/ndb_backup51_data_be
-usr/share/mysql/mysql-test/std_data/ndb_backup51
 usr/share/mysql/mysql-test/std_data/funcs_1

debian/patches/00list

@@ -1,6 +1,5 @@
 # 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 # 01_MAKEFILES__Docs_Makefile.in.dpatch
-# 02_no_builtin_ndbcluster_plugin.dpatch
 # 21_init__openquery_configtest.dpatch
 33_scripts__mysql_create_system_tables__no_test.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch

debian/patches/02_no_builtin_ndbcluster_plugin.dpatch

@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_no_builtin_ndbcluster_plugin.dpatch by  <ch@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: As we completely disabled ndbcluster
-
-@DPATCH@
-
---- old/sql/sql_builtin.cc
-+++ new/sql/sql_builtin.cc
-@@ -22,6 +22,6 @@
- 
- struct st_mysql_plugin *mysqld_builtins[]=
- {
--  builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, builtin_ndbcluster_plugin,(struct st_mysql_plugin *)0
-+  builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, (struct st_mysql_plugin *)0
- };
- 

debian/po/ar.po

@@ -212,21 +212,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"

debian/po/ca.po

@@ -177,21 +177,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #, fuzzy
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "

debian/po/cs.po

@@ -214,21 +214,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"

debian/po/da.po

@@ -216,21 +216,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"

debian/po/de.po

@@ -214,21 +214,3 @@ msgstr ""
 "Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte "
 "erneut versuchen."
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr "NDB-Cluster scheint gerade benutzt zu werden"
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-"MySQL-5.1 bietet keine NDB-Clusterunterstützung mehr. Bitte migrieren Sie "
-"Ihr System zum neuen »mysql-cluster«-Paket und entfernen Sie alle Zeilen, "
-"die mit »ndb« beginnen aus allen Konfigurationsdateien im Verzeichnis /etc/"
-"mysql/."

debian/po/es.po

@@ -244,21 +244,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"

debian/po/eu.po

@@ -206,29 +206,6 @@ msgstr "Pasahitz sarrera errorea"
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz."
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr "Dirudienez NDB Cluster-a erabilia dago"
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-#, fuzzy
-#| msgid ""
-#| "MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new "
-#| "mysql-cluster package and remove all lines starting with \"ndb\" from all "
-#| "config files below /etc/mysql/."
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-"MySQL-5.1-ek NDB cluster euskarri umezurtz bat behar du. Mesedez migratu "
-"mysql-cluster pakete berrira eta /etc/mysql/ azpiko konfigurazio fitxategi "
-"guztietan \"ndb\"-ez hasten diren lerro guztiak ezabatu."
-
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"

debian/po/fr.po

@@ -202,24 +202,6 @@ msgstr ""
 "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez "
 "recommencer."
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr "Abandon de la gestion de NDB"
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-"La version 5.1 de MySQL ne gère plus les grappes NDB. Vous devriez utiliser "
-"le paquet mysql-cluster et supprimer toutes les lignes commençant par "
-"« ndb » des fichiers de configuration situés dans /etc/mysql."
-
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
 #~ "to the system:"

debian/po/gl.po

@@ -208,21 +208,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"

debian/po/it.po

@@ -199,20 +199,3 @@ msgstr "Errore di inserimento della password"
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Le due password inserite sono diverse. Riprovare."
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr "È in uso un cluster NDB"
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-"MySQL-5.1 non fornisce più il supporto per i cluster NDB. Si dovrebbe "
-"migrare al nuovo pacchetto mysql-cluster e rimuovere tutte le righe che "
-"iniziano per \"ndb\" da tutti i file di configurazione sotto /etc/mysql/."

debian/po/ja.po

@@ -205,20 +205,3 @@ msgstr "パスワード入力エラー"
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "入力された二つのパスワードが一致しません。再入力してください。"
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr "NDB クラスタが利用されているようです"
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-"MySQL-5.1 では NDB クラスタのサポートを提供しなくなっています。新たな mysql-"
-"cluster パッケージに移行して、/etc/mysql 以下の設定ファイルすべてから「ndb」"
-"で始まる行を削除してください。"

debian/po/nb.po

@@ -222,21 +222,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

debian/po/nl.po

@@ -223,21 +223,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

debian/po/pt.po

@@ -213,21 +213,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"

debian/po/pt_BR.po

@@ -212,21 +212,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "To use MariaDB, the following entries for users and groups should be "
 #~ "added to the system:"

debian/po/ro.po

@@ -222,21 +222,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid "Cannot upgrade if ISAM tables are present!"
 #~ msgstr "Nu se poate face actualizarea dacă sunt prezente tabele ISAM!"
 

debian/po/ru.po

@@ -206,20 +206,3 @@ msgstr "Ошибка ввода пароля"
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "Два введённых пароля не одинаковы. Повторите ввод."
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr "NDB Cluster уже используется"
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-"MySQL-5.1 больше не поддерживает NDB Cluster. Переходите на новый пакет "
-"mysql-cluster и удалите все строки, начинающиеся с \"ndb\", из всех файлов "
-"настройки в каталоге /etc/mysql/."

debian/po/sv.po

@@ -200,24 +200,6 @@ msgstr "Fel vid inmatning av lösenord"
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "De två lösenorden du angav stämde inte överrens. Prova igen."
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr "NDB-kluster används inte"
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-"Stödet för NDB-kluster har tagits bort i MySQL-5.1. Migrera till det nya "
-"paketet mysql-cluster och ta bort alla rader som inleds med \"ndb\" från "
-"alla inställlningsfiler i /etc/mysql/."
-
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
 #~ "to the system:"

debian/po/templates.pot

@@ -170,18 +170,3 @@ msgstr ""
 #: ../mariadb-server-10.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""

debian/po/tr.po

@@ -178,21 +178,6 @@ msgstr ""
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../mariadb-server-10.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "
 #~ "following and ensure yourself that /var/lib/mysql has the right "

extra/CMakeLists.txt

@@ -13,15 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}/include 
-${ZLIB_INCLUDE_DIR}
-# Following is for perror, in case NDB is compiled in.
-${CMAKE_SOURCE_DIR}/storage/ndb/include
-${CMAKE_SOURCE_DIR}/storage/ndb/include/util  
-${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
-${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
-${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${ZLIB_INCLUDE_DIR})
 
 # Default install component for the files is Server here
 SET(MYSQL_INSTALL_COMPONENT Server)

extra/perror.c

@@ -23,11 +23,6 @@
 #include <m_string.h>
 #include <errno.h>
 #include <my_getopt.h>
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-#include "../storage/ndb/src/ndbapi/ndberror.c"
-#include "../storage/ndb/src/kernel/error/ndbd_exit_codes.c"
-#include "../storage/ndb/include/mgmapi/mgmapi_error.h"
-#endif
 #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
 static my_bool verbose, print_all_codes;
@@ -35,35 +30,12 @@ static my_bool verbose, print_all_codes;
 #include <my_base.h>
 #include <my_handler_errors.h>
 
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-static my_bool ndb_code;
-static char ndb_string[1024];
-int mgmapi_error_string(int err_no, char *str, int size)
-{
-  int i;
-  for (i= 0; i < ndb_mgm_noOfErrorMsgs; i++)
-  {
-    if ((int)ndb_mgm_error_msgs[i].code == err_no)
-    {
-      my_snprintf(str, size-1, "%s", ndb_mgm_error_msgs[i].msg);
-      str[size-1]= '\0';
-      return 0;
-    }
-  }
-  return -1;
-}
-#endif
-
 static struct my_option my_long_options[] =
 {
   {"help", '?', "Displays this help and exits.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
   {"info", 'I', "Synonym for --help.",  0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-  {"ndb", 257, "Ndbcluster storage engine specific error codes.", &ndb_code,
-   &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-#endif
 #ifdef HAVE_SYS_ERRLIST
   {"all", 'a', "Print all the error messages and the number. Deprecated,"
    " will be removed in a future release.",
@@ -334,35 +306,7 @@ int main(int argc,char *argv[])
 
       found=0;
       code=atoi(*argv);
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-      if (ndb_code)
-      {
-        if ((ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0) &&
-            (ndbd_exit_string(code, ndb_string, sizeof(ndb_string)) < 0) &&
-            (mgmapi_error_string(code, ndb_string, sizeof(ndb_string)) < 0))
-	{
-          msg= 0;
-	}
-	else
-	  msg= ndb_string;
-        if (msg)
-        {
-          if (verbose)
-            printf("NDB error code %3d: %s\n",code,msg);
-          else
-            puts(msg);
-        }
-        else
-        {
-	  fprintf(stderr,"Illegal ndb error code: %d\n",code);
-          error= 1;
-        }
-        found= 1;
-        msg= 0;
-      }
-      else
-#endif
-	msg = strerror(code);
+      msg = strerror(code);
 
       /*
         We don't print the OS error message if it is the same as the

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,

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 */

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",

man/mysql-test-run.pl.1

@@ -1141,25 +1141,6 @@ Section\ \&4.9, \(lqPassing Options from mysql-test-run.pl to mysqld or mysqltes
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: ndb-connectstring option
-.\" ndb-connectstring option: mysql-test-run.pl
-\fB\-\-ndb\-connectstring=\fR\fB\fIstr\fR\fR
-.sp
-Pass
-\fB\-\-ndb\-connectstring=\fR\fB\fIstr\fR\fR
-to the master MySQL server\&. This option also prevents
-\fBmysql\-test\-run\&.pl\fR
-from starting a cluster\&. It is assumed that there is already a cluster running to which the server can connect with the given connectstring\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 .\" mysql-test-run.pl: nocheck-testcases option
 .\" nocheck-testcases option: mysql-test-run.pl
 \fB\-\-nocheck\-testcases\fR
@@ -1445,42 +1426,6 @@ Do not apply combinations; ignore combinations file or option\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysql-test-run.pl: skip-ndbcluster option
-.\" skip-ndbcluster option: mysql-test-run.pl
-\fB\-\-skip\-ndbcluster\fR,
-.\" mysql-test-run.pl: skip-ndb option
-.\" skip-ndb option: mysql-test-run.pl
-\fB\-\-skip\-ndb\fR
-.sp
-Do not start NDB Cluster; skip Cluster test cases\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql-test-run.pl: skip-ndbcluster-slave option
-.\" skip-ndbcluster-slave option: mysql-test-run.pl
-\fB\-\-skip\-ndbcluster\-slave\fR,
-.\" mysql-test-run.pl: skip-ndb-slave option
-.\" skip-ndb-slave option: mysql-test-run.pl
-\fB\-\-skip\-ndb\-slave\fR
-.sp
-Do not start an NDB Cluster slave\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 .\" mysql-test-run.pl: skip-rpl option
 .\" skip-rpl option: mysql-test-run.pl
 \fB\-\-skip\-rpl\fR
@@ -2034,20 +1979,6 @@ Search the server log for errors or warning after each test and report any suspi
 .RE
 .sp
 .RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql-test-run.pl: with-ndbcluster-only option
-.\" with-ndbcluster-only option: mysql-test-run.pl
-\fB\-\-with\-ndbcluster\-only\fR
-.sp
-Run only test cases that have
-ndb
-in their name\&.
 .RE
 .SH "COPYRIGHT"
 .br

man/mysqldump.1

@@ -1718,14 +1718,6 @@ option are mutually exclusive because
 LOCK TABLES
 causes any pending transactions to be committed implicitly\&.
 .sp
-This option is not supported for MySQL Cluster tables; the results cannot be guaranteed to be consistent due to the fact that the
-NDBCLUSTER
-storage engine supports only the
-READ_COMMITTED
-transaction isolation level\&. You should always use
-NDB
-backup and restore instead\&.
-.sp
 To dump large tables, you should combine the
 \fB\-\-single\-transaction\fR
 option with

man/ndbd.8

@@ -1,819 +0,0 @@
-'\" t
-.\"     Title: \fBndbd\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
-.\"
-.TH "\FBNDBD\FR" "8" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.\" ndbd
-.\" MySQL Cluster: ndbd
-.\" MySQL Cluster: data nodes
-.\" data nodes (MySQL Cluster)
-.\" storage nodes - see data nodes, ndbd
-.SH "NAME"
-ndbd \- the MySQL Cluster data node daemon
-.SH "SYNOPSIS"
-.HP \w'\fBndbd\ \fR\fB\fIoptions\fR\fR\ 'u
-\fBndbd \fR\fB\fIoptions\fR\fR
-.SH "DESCRIPTION"
-.PP
-\fBndbd\fR
-is the process that is used to handle all the data in tables using the NDB Cluster storage engine\&. This is the process that empowers a data node to accomplish distributed transaction handling, node recovery, checkpointing to disk, online backup, and related tasks\&.
-.PP
-In a MySQL Cluster, a set of
-\fBndbd\fR
-processes cooperate in handling data\&. These processes can execute on the same computer (host) or on different computers\&. The correspondences between data nodes and Cluster hosts is completely configurable\&.
-.\" MySQL Cluster: administration
-.\" MySQL Cluster: commands
-.\" command options (MySQL Cluster): ndbd
-.\" MySQL Cluster: ndbd process
-.PP
-The following table includes command options specific to the MySQL Cluster data node program
-\fBndbd\fR\&. Additional descriptions follow the table\&. For options common to all MySQL Cluster programs, see
-Section\ \&17.4.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-All of these options also apply to the multi\-threaded version of this program \(em
-\fBndbmtd\fR, which is available in MySQL Cluster NDB 7\&.0 \(em and you may substitute
-\(lq\fBndbmtd\fR\(rq
-for
-\(lq\fBndbd\fR\(rq
-wherever the latter occurs in this section\&.
-.sp .5v
-.RE
-.PP
-For options common to all
-NDBCLUSTER
-programs, see
-Section\ \&17.4.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-\fB\-\-bind\-address\fR
-.TS
-allbox tab(:);
-l l s
-l l s
-l l s
-^ l l
-^ l l.
-T{
-\fBVersion Introduced\fR
-T}:T{
-5\&.1\&.12
-T}
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-\-bind\-address=name
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-string
-T}
-:T{
-\fBDefault\fR
-T}:T{
-T}
-.TE
-.sp 1
-Causes
-\fBndbd\fR
-to bind to a specific network interface (host name or IP address)\&. This option has no default value\&.
-.sp
-This option was added in MySQL 5\&.1\&.12\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-\fB\-\-daemon\fR,
-\fB\-d\fR
-.TS
-allbox tab(:);
-l l s
-l l s
-^ l l
-^ l l.
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-\-daemon
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-boolean
-T}
-:T{
-\fBDefault\fR
-T}:T{
-TRUE
-T}
-.TE
-.sp 1
-Instructs
-\fBndbd\fR
-to execute as a daemon process\&. This is the default behavior\&.
-\fB\-\-nodaemon\fR
-can be used to prevent the process from running as a daemon\&.
-.sp
-This option has no effect when running
-\fBndbd\fR
-or
-\fBndbmtd\fR
-on Windows platforms\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" --initial option (ndbd)
-.\" --initial option (ndbmtd)
-\fB\-\-initial\fR
-.TS
-allbox tab(:);
-l l s
-l l s
-^ l l
-^ l l.
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-\-initial
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-boolean
-T}
-:T{
-\fBDefault\fR
-T}:T{
-FALSE
-T}
-.TE
-.sp 1
-Instructs
-\fBndbd\fR
-to perform an initial start\&. An initial start erases any files created for recovery purposes by earlier instances of
-\fBndbd\fR\&. It also re\-creates recovery log files\&. Note that on some operating systems this process can take a substantial amount of time\&.
-.sp
-An
-\fB\-\-initial\fR
-start is to be used
-\fIonly\fR
-when starting the
-\fBndbd\fR
-process under very special circumstances; this is because this option causes all files to be removed from the Cluster file system and all redo log files to be re\-created\&. These circumstances are listed here:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-When performing a software upgrade which has changed the contents of any files\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-When restarting the node with a new version of
-\fBndbd\fR\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-As a measure of last resort when for some reason the node restart or system restart repeatedly fails\&. In this case, be aware that this node can no longer be used to restore data due to the destruction of the data files\&.
-.RE
-.RS 4
-Use of this option prevents the
-StartPartialTimeout
-and
-StartPartitionedTimeout
-configuration parameters from having any effect\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBImportant\fR
-.ps -1
-.br
-This option does
-\fInot\fR
-affect either of the following:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Backup files that have already been created by the affected node
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-MySQL Cluster Disk Data files (see
-Section\ \&17.5.10, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
-.RE
-.RS 4
-.sp
-This option also has no effect on recovery of data by a data node that is just starting (or restarting) from data nodes that are already running\&. This recovery of data occurs automatically, and requires no user intervention in a MySQL Cluster that is running normally\&.
-.sp .5v
-.RE
-It is permissible to use this option when starting the cluster for the very first time (that is, before any data node files have been created); however, it is
-\fInot\fR
-necessary to do so\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" --initial-start option (ndbd)
-.\" --initial-start option (ndbmtd)
-\fB\-\-initial\-start\fR
-.TS
-allbox tab(:);
-l l s
-l l s
-l l s
-^ l l
-^ l l.
-T{
-\fBVersion Introduced\fR
-T}:T{
-5\&.1\&.11
-T}
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-\-initial\-start
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-boolean
-T}
-:T{
-\fBDefault\fR
-T}:T{
-FALSE
-T}
-.TE
-.sp 1
-This option is used when performing a partial initial start of the cluster\&. Each node should be started with this option, as well as
-\fB\-\-nowait\-nodes\fR\&.
-.sp
-Suppose that you have a 4\-node cluster whose data nodes have the IDs 2, 3, 4, and 5, and you wish to perform a partial initial start using only nodes 2, 4, and 5 \(em that is, omitting node 3:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBndbd \-\-ndb\-nodeid=2 \-\-nowait\-nodes=3 \-\-initial\-start\fR
-shell> \fBndbd \-\-ndb\-nodeid=4 \-\-nowait\-nodes=3 \-\-initial\-start\fR
-shell> \fBndbd \-\-ndb\-nodeid=5 \-\-nowait\-nodes=3 \-\-initial\-start\fR
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-Prior to MySQL 5\&.1\&.19, it was not possible to perform DDL operations involving Disk Data tables on a partially started cluster\&. (See
-\m[blue]\fBBug#24631\fR\m[]\&\s-2\u[1]\d\s+2\&.)
-.sp
-When using this option, you must also specify the node ID for the data node being started with the
-\fB\-\-ndb\-nodeid\fR
-option\&.
-.sp
-This option was added in MySQL 5\&.1\&.11\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBImportant\fR
-.ps -1
-.br
-Do not confuse this option with the
-\fB\-\-nowait\-nodes\fR
-option added for
-\fBndb_mgmd\fR
-in MySQL Cluster NDB 7\&.0\&.10, which can be used to allow a cluster configured with multiple management servers to be started without all management servers being online\&.
-.sp .5v
-.RE
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" --nowait-nodes option (ndbd)
-.\" --nowait-nodes option (ndbmtd)
-\fB\-\-nowait\-nodes=\fR\fB\fInode_id_1\fR\fR\fB[, \fR\fB\fInode_id_2\fR\fR\fB[, \&.\&.\&.]]\fR
-.TS
-allbox tab(:);
-l l s
-l l s
-l l s
-^ l l
-^ l l.
-T{
-\fBVersion Introduced\fR
-T}:T{
-5\&.1\&.9
-T}
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-\-nowait\-nodes=list
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-string
-T}
-:T{
-\fBDefault\fR
-T}:T{
-T}
-.TE
-.sp 1
-This option takes a list of data nodes which for which the cluster will not wait for before starting\&.
-.sp
-This can be used to start the cluster in a partitioned state\&. For example, to start the cluster with only half of the data nodes (nodes 2, 3, 4, and 5) running in a 4\-node cluster, you can start each
-\fBndbd\fR
-process with
-\fB\-\-nowait\-nodes=3,5\fR\&. In this case, the cluster starts as soon as nodes 2 and 4 connect, and does
-\fInot\fR
-wait
-StartPartitionedTimeout
-milliseconds for nodes 3 and 5 to connect as it would otherwise\&.
-.sp
-If you wanted to start up the same cluster as in the previous example without one
-\fBndbd\fR
-\(em say, for example, that the host machine for node 3 has suffered a hardware failure \(em then start nodes 2, 4, and 5 with
-\fB\-\-nowait\-nodes=3\fR\&. Then the cluster will start as soon as nodes 2, 4, and 5 connect and will not wait for node 3 to start\&.
-.sp
-This option was added in MySQL 5\&.1\&.9\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" --nodaemon option (ndbd)
-.\" --nodaemon option (ndbmtd)
-\fB\-\-nodaemon\fR
-.TS
-allbox tab(:);
-l l s
-l l s
-^ l l
-^ l l
-l l s
-^ l l
-^ l l.
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-\-nodaemon
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-boolean
-T}
-:T{
-\fBDefault\fR
-T}:T{
-FALSE
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR (windows)
-T}:T{
-boolean
-T}
-:T{
-\fBDefault\fR
-T}:T{
-TRUE
-T}
-.TE
-.sp 1
-Instructs
-\fBndbd\fR
-not to start as a daemon process\&. This is useful when
-\fBndbd\fR
-is being debugged and you want output to be redirected to the screen\&.
-.sp
-As of MySQL Cluster NDB 7\&.0\&.8, the default behavior for
-\fBndbd\fR
-and
-\fBndbmtd\fR
-on Windows is to run in the foreground, making this option unnecessary on Windows platforms\&. (\m[blue]\fBBug#45588\fR\m[]\&\s-2\u[2]\d\s+2)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" --nostart option (ndbd)
-.\" -n option (ndbd)
-.\" --nostart option (ndbmtd)
-.\" -n option (ndbmtd)
-\fB\-\-nostart\fR,
-\fB\-n\fR
-.TS
-allbox tab(:);
-l l s
-l l s
-^ l l
-^ l l.
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-\-nostart
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-boolean
-T}
-:T{
-\fBDefault\fR
-T}:T{
-FALSE
-T}
-.TE
-.sp 1
-Instructs
-\fBndbd\fR
-not to start automatically\&. When this option is used,
-\fBndbd\fR
-connects to the management server, obtains configuration data from it, and initializes communication objects\&. However, it does not actually start the execution engine until specifically requested to do so by the management server\&. This can be accomplished by issuing the proper
-START
-command in the management client (see
-Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
-.RE
-.\" MySQL Cluster: log files
-.\" log files (MySQL Cluster)
-.PP
-\fBndbd\fR
-generates a set of log files which are placed in the directory specified by
-DataDir
-in the
-config\&.ini
-configuration file\&.
-.PP
-These log files are listed below\&.
-\fInode_id\fR
-is the node\'s unique identifier\&. Note that
-\fInode_id\fR
-represents the node\'s unique identifier\&. For example,
-ndb_2_error\&.log
-is the error log generated by the data node whose node ID is
-2\&.
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" MySQL Cluster: error logs
-.\" error logs (MySQL Cluster)
-ndb_\fInode_id\fR_error\&.log
-is a file containing records of all crashes which the referenced
-\fBndbd\fR
-process has encountered\&. Each record in this file contains a brief error string and a reference to a trace file for this crash\&. A typical entry in this file might appear as shown here:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-Date/Time: Saturday 30 July 2004 \- 00:20:01
-Type of error: error
-Message: Internal program error (failed ndbrequire)
-Fault ID: 2341
-Problem data: DbtupFixAlloc\&.cpp
-Object of reference: DBTUP (Line: 173)
-ProgramName: NDB Kernel
-ProcessID: 14909
-TraceFile: ndb_2_trace\&.log\&.2
-***EOM***
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-Listings of possible
-\fBndbd\fR
-exit codes and messages generated when a data node process shuts down prematurely can be found in
-\m[blue]\fBndbd Error Messages\fR\m[]\&\s-2\u[3]\d\s+2\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBImportant\fR
-.ps -1
-.br
-\fIThe last entry in the error log file is not necessarily the newest one\fR
-(nor is it likely to be)\&. Entries in the error log are
-\fInot\fR
-listed in chronological order; rather, they correspond to the order of the trace files as determined in the
-ndb_\fInode_id\fR_trace\&.log\&.next
-file (see below)\&. Error log entries are thus overwritten in a cyclical and not sequential fashion\&.
-.sp .5v
-.RE
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" MySQL Cluster: trace files
-.\" trace files (MySQL Cluster)
-ndb_\fInode_id\fR_trace\&.log\&.\fItrace_id\fR
-is a trace file describing exactly what happened just before the error occurred\&. This information is useful for analysis by the MySQL Cluster development team\&.
-.sp
-It is possible to configure the number of these trace files that will be created before old files are overwritten\&.
-\fItrace_id\fR
-is a number which is incremented for each successive trace file\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ndb_\fInode_id\fR_trace\&.log\&.next
-is the file that keeps track of the next trace file number to be assigned\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ndb_\fInode_id\fR_out\&.log
-is a file containing any data output by the
-\fBndbd\fR
-process\&. This file is created only if
-\fBndbd\fR
-is started as a daemon, which is the default behavior\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ndb_\fInode_id\fR\&.pid
-is a file containing the process ID of the
-\fBndbd\fR
-process when started as a daemon\&. It also functions as a lock file to avoid the starting of nodes with the same identifier\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-ndb_\fInode_id\fR_signal\&.log
-is a file used only in debug versions of
-\fBndbd\fR, where it is possible to trace all incoming, outgoing, and internal messages with their data in the
-\fBndbd\fR
-process\&.
-.RE
-.PP
-It is recommended not to use a directory mounted through NFS because in some environments this can cause problems whereby the lock on the
-\&.pid
-file remains in effect even after the process has terminated\&.
-.PP
-To start
-\fBndbd\fR, it may also be necessary to specify the host name of the management server and the port on which it is listening\&. Optionally, one may also specify the node ID that the process is to use\&.
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBndbd \-\-connect\-string="nodeid=2;host=ndb_mgmd\&.mysql\&.com:1186"\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-See
-Section\ \&17.3.2.3, \(lqThe MySQL Cluster Connectstring\(rq, for additional information about this issue\&.
-\fBndbd\fR(8), describes other options for
-\fBndbd\fR\&.
-.PP
-When
-\fBndbd\fR
-starts, it actually initiates two processes\&. The first of these is called the
-\(lqangel process\(rq; its only job is to discover when the execution process has been completed, and then to restart the
-\fBndbd\fR
-process if it is configured to do so\&. Thus, if you attempt to kill
-\fBndbd\fR
-via the Unix
-\fBkill\fR
-command, it is necessary to kill both processes, beginning with the angel process\&. The preferred method of terminating an
-\fBndbd\fR
-process is to use the management client and stop the process from there\&.
-.PP
-The execution process uses one thread for reading, writing, and scanning data, as well as all other activities\&. This thread is implemented asynchronously so that it can easily handle thousands of concurrent actions\&. In addition, a watch\-dog thread supervises the execution thread to make sure that it does not hang in an endless loop\&. A pool of threads handles file I/O, with each thread able to handle one open file\&. Threads can also be used for transporter connections by the transporters in the
-\fBndbd\fR
-process\&. In a multi\-processor system performing a large number of operations (including updates), the
-\fBndbd\fR
-process can consume up to 2 CPUs if permitted to do so\&.
-.PP
-For a machine with many CPUs it is possible to use several
-\fBndbd\fR
-processes which belong to different node groups; however, such a configuration is still considered experimental and is not supported for MySQL 5\&.1 in a production setting\&. See
-Section\ \&17.1.5, \(lqKnown Limitations of MySQL Cluster\(rq\&.
-.SH "COPYRIGHT"
-.br
-.PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
-.sp
-.SH "NOTES"
-.IP " 1." 4
-Bug#24631
-.RS 4
-\%http://bugs.mysql.com/bug.php?id=24631
-.RE
-.IP " 2." 4
-Bug#45588
-.RS 4
-\%http://bugs.mysql.com/bug.php?id=45588
-.RE
-.IP " 3." 4
-ndbd Error Messages
-.RS 4
-\%http://dev.mysql.com/doc/ndbapi/en/ndbd-error-messages.html
-.RE
-.SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
-.SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).

man/ndbd_redo_log_reader.1

@@ -1,176 +0,0 @@
-'\" t
-.\"     Title: \fBndbd_redo_log_reader\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
-.\"
-.TH "\FBNDBD_REDO_LOG_REA" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.\" ndbd_redo_log_reader
-.SH "NAME"
-ndbd_redo_log_reader \- check and print content of cluster redo log
-.SH "SYNOPSIS"
-.HP \w'\fBndbd_redo_log_reader\ \fR\fB\fIfile_name\fR\fR\fB\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
-\fBndbd_redo_log_reader \fR\fB\fIfile_name\fR\fR\fB [\fR\fB\fIoptions\fR\fR\fB]\fR
-.SH "DESCRIPTION"
-.PP
-Reads a redo log file, checking it for errors, printing its contents in a human\-readable format, or both\&.
-\fBndbd_redo_log_reader\fR
-is intended for use primarily by MySQL developers and support personnel in debugging and diagnosing problems\&.
-.PP
-This utility was made available as part of default builds beginning with MySQL Cluster NDB 6\&.1\&.3\&. It remains under development, and its syntax and behavior are subject to change in future releases\&. For this reason, it should be considered experimental at this time\&.
-.PP
-The C++ source files for
-\fBndbd_redo_log_reader\fR
-can be found in the directory
-/storage/ndb/src/kernel/blocks/dblqh/redoLogReader\&.
-.PP
-The following table includes options that are specific to the MySQL Cluster program
-\fBndbd_redo_log_reader\fR\&. Additional descriptions follow the table\&. For options common to all MySQL Cluster programs, see
-Section\ \&17.4.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
-.PP
-\fBUsage\fR:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-ndbd_redo_log_reader \fIfile_name\fR [\fIoptions\fR]
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-\fIfile_name\fR
-is the name of a cluster REDO log file\&. REDO log files are located in the numbered directories under the data node\'s data directory (DataDir); the path under this directory to the REDO log files matches the pattern
-ndb_\fI#\fR_fs/D\fI#\fR/LCP/\fI#\fR/T\fI#\fRF\fI#\fR\&.Data\&. In each case, the
-\fI#\fR
-represents a number (not necessarily the same number)\&. For more information, see
-\m[blue]\fBCluster Data Node FileSystemDir Files\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-The name of the file to be read may be followed by one or more of the options listed here:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.TS
-allbox tab(:);
-l l s
-l l s
-^ l l
-^ l l.
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-noprint
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-boolean
-T}
-:T{
-\fBDefault\fR
-T}:T{
-FALSE
-T}
-.TE
-.sp 1
-\fB\-noprint\fR: Do not print the contents of the log file\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.TS
-allbox tab(:);
-l l s
-l l s
-^ l l
-^ l l.
-T{
-\fBCommand\-Line Format\fR
-T}:T{
-\-nocheck
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values \fR
-T}
-:T{
-\fBType\fR
-T}:T{
-boolean
-T}
-:T{
-\fBDefault\fR
-T}:T{
-FALSE
-T}
-.TE
-.sp 1
-\fB\-nocheck\fR: Do not check the log file for errors\&.
-.RE
-.sp
-.RE
-.PP
-Like
-\fBndb_print_backup_file\fR
-and
-\fBndb_print_schema_file\fR
-(and unlike most of the
-NDB
-utilities that are intended to be run on a management server host or to connect to a management server)
-\fBndbd_redo_log_reader\fR
-must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
-.SH "COPYRIGHT"
-.br
-.PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
-.sp
-.SH "NOTES"
-.IP " 1." 4
-Cluster Data Node FileSystemDir Files
-.RS 4
-\%http://dev.mysql.com/doc/ndbapi/en/ndb-internals-ndbd-filesystemdir-files.html
-.RE
-.SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
-.SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).

man/ndbmtd.8

@@ -1,388 +0,0 @@
-'\" t
-.\"     Title: \fBndbmtd\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
-.\"
-.TH "\FBNDBMTD\FR" "8" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.\" ndbmtd
-.\" MySQL Cluster: ndbmtd
-.\" MySQL Cluster: data nodes
-.\" data nodes (MySQL Cluster)
-.\" storage nodes - see data nodes, ndbd, ndbmtd
-.SH "NAME"
-ndbmtd \- the MySQL Cluster data node daemon (multi\-threaded version)
-.SH "SYNOPSIS"
-.HP \w'\fBndbmtd\ \fR\fB\fIoptions\fR\fR\ 'u
-\fBndbmtd \fR\fB\fIoptions\fR\fR
-.SH "DESCRIPTION"
-.PP
-\fBndbmtd\fR
-is a multi\-threaded version of
-\fBndbd\fR, the process that is used to handle all the data in tables using the
-NDBCLUSTER
-storage engine\&.
-\fBndbmtd\fR
-is intended for use on host computers having multiple CPU cores\&. Except where otherwise noted,
-\fBndbmtd\fR
-functions in the same way as
-\fBndbd\fR; therefore, in this section, we concentrate on the ways in which
-\fBndbmtd\fR
-differs from
-\fBndbd\fR, and you should consult
-\fBndbd\fR(8), for additional information about running MySQL Cluster data nodes that apply to both the single\-threaded and multi\-threaded versions of the data node process\&.
-.PP
-Command\-line options and configuration parameters used with
-\fBndbd\fR
-also apply to
-\fBndbmtd\fR\&. For more information about these options and parameters, see
-\fBndbd\fR(8), and
-Section\ \&17.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
-.PP
-\fBndbmtd\fR
-is also file system\-compatible with
-\fBndbd\fR\&. In other words, a data node running
-\fBndbd\fR
-can be stopped, the binary replaced with
-\fBndbmtd\fR, and then restarted without any loss of data\&. (However, when doing this, you must make sure that
-MaxNoOfExecutionThreads
-is set to an apppriate value before restarting the node if you wish for
-\fBndbmtd\fR
-to run in multi\-threaded fashion\&.) Similarly, an
-\fBndbmtd\fR
-binary can be replaced with
-\fBndbd\fR
-simply by stopping the node and then starting
-\fBndbd\fR
-in place of the multi\-threaded binary\&. It is not necessary when switching between the two to start the data node binary using
-\fB\-\-initial\fR\&.
-.PP
-Prior to MySQL Cluster NDB 7\&.0\&.6, there were known issues when using
-\fBndbmtd\fR
-with MySQL Cluster Disk Data tables\&. If you wish to use multi\-threaded data nodes with disk\-based
-NDB
-tables, you should ensure that you are running MySQL Cluster NDB 7\&.0\&.6 or later\&. (\m[blue]\fBBug#41915\fR\m[]\&\s-2\u[1]\d\s+2,
-\m[blue]\fBBug#44915\fR\m[]\&\s-2\u[2]\d\s+2)
-.PP
-Using
-\fBndbmtd\fR
-differs from using
-\fBndbd\fR
-in two key respects:
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-You must set an appropriate value for the
-MaxNoOfExecutionThreads
-configuration parameter in the
-config\&.ini
-file\&. If you do not do so,
-\fBndbmtd\fR
-runs in single\-threaded mode \(em that is, it behaves like
-\fBndbd\fR\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-Trace files are generated by critical errors in
-\fBndbmtd\fR
-processes in a somewhat different fashion from how these are generated by
-\fBndbd\fR
-failures\&.
-.RE
-.PP
-These differences are discussed in more detail in the next few paragraphs\&.
-.\" execution threads (MySQL Cluster)
-.\" MySQL Cluster: execution threads
-.\" ndbmtd: MaxNoOfExecutionThreads
-.\" MaxNoOfExecutionThreads: ndbmtd
-.\" ndbmtd: trace files
-.\" trace files: ndbmtd
-.PP
-\fBNumber of execution threads\fR. The
-MaxNoOfExecutionThreads
-configuration parameter is used to determine the number of local query handler (LQH) threads spawned by
-\fBndbmtd\fR\&. Although this parameter is set in
-[ndbd]
-or
-[ndbd default]
-sections of the
-config\&.ini
-file, it is exclusive to
-\fBndbmtd\fR
-and does not apply to
-\fBndbd\fR\&.
-.PP
-This parameter takes an integer value from 2 to 8 inclusive\&. Generally, you should set this parameter equal to the number of CPU cores on the data node host, as shown in the following table:
-.TS
-allbox tab(:);
-lB lB.
-T{
-Number of Cores
-T}:T{
-Recommended MaxNoOfExecutionThreads Value
-T}
-.T&
-l l
-l l
-l l.
-T{
-2
-T}:T{
-2
-T}
-T{
-4
-T}:T{
-4
-T}
-T{
-8 or more
-T}:T{
-8
-T}
-.TE
-.sp 1
-.PP
-(It is possible to set this parameter to other values within the permitted range, but these are automatically rounded as shown in the
-\fBValue Used\fR
-column of the next table in this section\&.)
-.PP
-The multi\-threaded data node process always spawns at least 4 threads:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-1 local query handler (LQH) thread
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-1 transaction coordinator (TC) thread
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-1 transporter thread
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-1 subscription manager (SUMA) thread
-.RE
-.PP
-Setting this parameter to a value between 4 and 8 inclusive causes additional LQH threads to be used by
-\fBndbmtd\fR
-(up to a maximum of 4 LQH threads), as shown in the following table:
-.TS
-allbox tab(:);
-lB lB lB.
-T{
-config\&.ini Value
-T}:T{
-Value Used
-T}:T{
-Number of LQH Threads Used
-T}
-.T&
-l l l
-l l l
-l l l.
-T{
-3
-T}:T{
-2
-T}:T{
-1
-T}
-T{
-5 or 6
-T}:T{
-4
-T}:T{
-2
-T}
-T{
-7
-T}:T{
-8
-T}:T{
-4
-T}
-.TE
-.sp 1
-.PP
-Setting this parameter outside the permitted range of values causes the management server to abort on startup with the error
-Error line \fInumber\fR: Illegal value \fIvalue\fR for parameter MaxNoOfExecutionThreads\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-In MySQL Cluster NDB 6\&.4\&.0, it is not possible to set
-MaxNoOfExecutionThreads
-to 2\&. You can safely use the value 3 instead (it is treated as 2 internally)\&. This issue is resolved in MySQL Cluster NDB 6\&.4\&.1\&.
-.sp .5v
-.RE
-.PP
-In MySQL Cluster NDB 6\&.4\&.0 through 6\&.4\&.3, the default value for this parameter was undefined, although the default behavior for
-\fBndbmtd\fR
-was to use 1 LQH thread, as though
-MaxNoOfExecutionThreads
-had been set to 2\&. Beginning with MySQL Cluster NDB 7\&.0\&.4, this parameter has an explcit default value of 2, thus guaranteeing this default behavior\&.
-.PP
-In MySQL Cluster NDB 7\&.0, it is not possible to cause
-\fBndbmtd\fR
-to use more than 1 TC thread, although we plan to introduce this capability in a future MySQL Cluster release series\&.
-.\" MySQL Cluster: log files
-.\" log files (MySQL Cluster): ndbmtd
-.\" ndbmtd: trace files
-.PP
-Like
-\fBndbd\fR,
-\fBndbmtd\fR
-generates a set of log files which are placed in the directory specified by
-DataDir
-in the
-config\&.ini
-configuration file\&. Except for trace files, these are generated in the same way and have the same names as those generated by
-\fBndbd\fR\&.
-.PP
-In the event of a critical error,
-\fBndbmtd\fR
-generates trace files describing what happened just prior to the error\' occurrence\&. These files, which can be found in the data node\'s
-DataDir, are useful for analysis of problems by the MySQL Cluster Development and Support teams\&. One trace file is generated for each
-\fBndbmtd\fR
-thread\&. The names of these files follow the pattern
-ndb_\fInode_id\fR_trace\&.log\&.\fItrace_id\fR_t\fIthread_id\fR, where
-\fInode_id\fR
-is the data node\'s unique node ID in the cluster,
-\fItrace_id\fR
-is a trace sequence number, and
-\fIthread_id\fR
-is the thread ID\&. For example, in the event of the failure of an
-\fBndbmtd\fR
-process running as a MySQL Cluster data node having the node ID 3 and with
-MaxNoOfExecutionThreads
-equal to 4, four trace files are generated in the data node\'s data directory; if the is the first time this node has failed, then these files are named
-ndb_3_trace\&.log\&.1_t1,
-ndb_3_trace\&.log\&.1_t2,
-ndb_3_trace\&.log\&.1_t3, and
-ndb_3_trace\&.log\&.1_t4\&. Internally, these trace files follow the same format as
-\fBndbd\fR
-trace files\&.
-.PP
-The
-\fBndbd\fR
-exit codes and messages that are generated when a data node process shuts down prematurely are also used by
-\fBndbmtd\fR\&. See
-\m[blue]\fBndbd Error Messages\fR\m[]\&\s-2\u[3]\d\s+2, for a listing of these\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-It is possible to use
-\fBndbd\fR
-and
-\fBndbmtd\fR
-concurrently on different data nodes in the same MySQL Cluster\&. However, such configurations have not been tested extensively; thus, we cannot not recommend doing so in a production setting at this time\&.
-.sp .5v
-.RE
-.SH "COPYRIGHT"
-.br
-.PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
-.sp
-.SH "NOTES"
-.IP " 1." 4
-Bug#41915
-.RS 4
-\%http://bugs.mysql.com/bug.php?id=41915
-.RE
-.IP " 2." 4
-Bug#44915
-.RS 4
-\%http://bugs.mysql.com/bug.php?id=44915
-.RE
-.IP " 3." 4
-ndbd Error Messages
-.RS 4
-\%http://dev.mysql.com/doc/ndbapi/en/ndbd-error-messages.html
-.RE
-.SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
-.SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).

man/perror.1

@@ -77,22 +77,6 @@ OS error code  64:  Machine is not on the network
 .RE
 .\}
 .PP
-To obtain the error message for a MySQL Cluster error code, invoke
-\fBperror\fR
-with the
-\fB\-\-ndb\fR
-option:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBperror \-\-ndb \fR\fB\fIerrorcode\fR\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
 Note that the meaning of system error messages may be dependent on your operating system\&. A given error code may mean different things on different operating systems\&.
 .PP
 \fBperror\fR
@@ -124,21 +108,6 @@ Display a help message and exit\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" perror: ndb option
-.\" ndb option: perror
-\fB\-\-ndb\fR
-.sp
-Print the error message for a MySQL Cluster error code\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 .\" perror: silent option
 .\" silent option: perror
 \fB\-\-silent\fR,

mysql-test/CMakeLists.txt

@@ -74,7 +74,7 @@ ENDIF()
 
 IF(WITH_EMBEDDED_SERVER)
  SET(TEST_EMBEDDED  ${MTR_FORCE} --comment=embedded  --timer  --embedded-server 
-   --skip-rpl --skip-ndbcluster ${EXP})
+   --skip-rpl ${EXP})
 ELSE()
  SET(TEST_EMBEDDED echo "Can not test embedded, not compiled in")
 ENDIF()
@@ -92,8 +92,8 @@ ADD_CUSTOM_TARGET(test-force
 
 ADD_CUSTOM_TARGET(test-bt
   ${TEST_BT_START}
-  COMMAND ${MTR_FORCE} --comment=normal --timer  --skip-ndbcluster --report-features ${EXP}
-  COMMAND ${MTR_FORCE} --comment=ps --timer	 --skip-ndbcluster --ps-protocol ${EXP}
+  COMMAND ${MTR_FORCE} --comment=normal --timer  --report-features ${EXP}
+  COMMAND ${MTR_FORCE} --comment=ps --timer	 --ps-protocol ${EXP}
   COMMAND ${MTR_FORCE} --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1 ${EXP}
   COMMAND ${MTR_FORCE} --comment=funcs2 --suite=funcs_2 ${EXP}
   COMMAND ${MTR_FORCE} --comment=partitions --suite=parts ${EXP}
@@ -105,13 +105,13 @@ ADD_CUSTOM_TARGET(test-bt
 
 ADD_CUSTOM_TARGET(test-bt-fast
   ${TEST_BT_START}
-  COMMAND ${MTR_FORCE}  --comment=ps  --timer  --skip-ndbcluster --ps-protocol --report-features ${EXP}
+  COMMAND ${MTR_FORCE}  --comment=ps  --timer  --ps-protocol --report-features ${EXP}
   COMMAND ${MTR_FORCE} --comment=stress --suite=stress ${EXP}
 )
 
 ADD_CUSTOM_TARGET(test-bt-debug
   ${TEST_BT_START}
-  COMMAND ${MTR_FORCE} --comment=debug --timer  --skip-ndbcluster --skip-rpl --report-features ${EXP}
+  COMMAND ${MTR_FORCE} --comment=debug --timer  --skip-rpl --report-features ${EXP}
 )
 
 # Process .in files with includes in collections/

mysql-test/collections/default.experimental

@@ -1,7 +1,7 @@
 # For easier human reading (MTR doesn't care), please keep entries
 # in alphabetical order. This also helps with merge conflict resolution.
 
-binlog.binlog_multi_engine               # joro : NDB tests marked as experimental as agreed with bochklin
+binlog.binlog_multi_engine               # joro : tests marked as experimental as agreed with bochklin
 
 funcs_1.charset_collation_1              # depends on compile-time decisions
 

mysql-test/collections/mysql-trunk.daily

@@ -2,6 +2,5 @@ perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collection
 perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row         --vardir=var-ps_row   --ps-protocol --mysqld=--binlog-format=row
 perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded       --vardir=var-emebbed  --embedded
 perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1        --vardir=var-funcs_1                                              --suite=funcs_1
-perl mysql-test-run.pl --timer --force --parallel=auto                                                 --comment=rpl_ndb_row    --vardir=var-rpl_ndb_row            --mysqld=--binlog-format=row  --suite=rpl_ndb,ndb
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog
 perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum  --mysqld=--binlog-checksum=CRC32  --vardir=var-rpl_binlog_checksum --suite=binlog,rpl

mysql-test/extra/rpl_tests/rpl_auto_increment.test

@@ -1,7 +1,6 @@
 #
 # Test of auto_increment with offset
 #
--- source include/not_ndb_default.inc
 -- source include/master-slave.inc
 
 eval create table t1 (a int not null auto_increment,b int, primary key (a)) engine=$engine_type2 auto_increment=3;

mysql-test/extra/rpl_tests/rpl_ddl.test

@@ -146,13 +146,10 @@ eval CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE=$engine_type;
 # Prevent Bug#26687 rpl_ddl test fails if run with --innodb option
 # The testscript (suite/rpl/rpl_ddl.test) + the expected result need that the
 # slave uses MyISAM for the table mysqltest.t1.
-# This is not valid in case of suite/rpl_ndb/rpl_ndb_ddl.test which sources
-# also this script.
 sync_slave_with_master;
 connection slave;
 if (`SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES
-     WHERE TABLE_SCHEMA = 'mysqltest1' AND TABLE_NAME = 't1'
-           AND ENGINE <> 'MyISAM' AND '$engine_type' <> 'NDB'`)
+     WHERE TABLE_SCHEMA = 'mysqltest1' AND TABLE_NAME = 't1' AND ENGINE <> 'MyISAM'`)
 {
    skip This test needs on slave side: InnoDB disabled, default engine: MyISAM;
 }

mysql-test/extra/rpl_tests/rpl_extra_col_slave.test

@@ -395,9 +395,6 @@ sync_slave_with_master;
 ###############################################################
 # Error reaction is up to sql_mode of the slave sql (bug#38173)
 #--echo *** Create t9 on slave  ***
-# Please, check BUG#47741 to see why you are not testing NDB.
-if (`SELECT UPPER(LEFT($engine_type, 3)) != 'NDB'`)
-{
   STOP SLAVE;
   RESET SLAVE;
   eval CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5),
@@ -446,8 +443,6 @@ if (`SELECT UPPER(LEFT($engine_type, 3)) != 'NDB'`)
   DROP TABLE t9;
   sync_slave_with_master;
 
-}
-
 ############################################
 # More columns in slave at middle of table #
 # Expect: Proper error message             #

mysql-test/extra/rpl_tests/rpl_foreign_key.test

@@ -21,9 +21,7 @@ connection master;
 SET TIMESTAMP=1000000000;
 CREATE TABLE t3 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
-# Had to add 1022 for run with ndb as ndb uses different
-# error and error code for error ER_DUP_ENTRY. Bug 16677
---error 1022, ER_DUP_ENTRY
+--error ER_DUP_ENTRY
 INSERT INTO t3 VALUES (1),(1);
 sync_slave_with_master;
 

mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test

@@ -64,22 +64,6 @@ while ($ddl_cases >= 1)
   {
     let $commit_event_row_number= 4;
   }
-  #
-  # In NDB (RBR and MIXED modes), the commit event is usually the seventh event
-  # in the binary log:
-  #
-  # 1: COMMAND
-  # 2: BEGIN
-  # 3: TABLE MAP EVENT
-  # 4: TABLE MAP EVENT (ndb_apply_status)
-  # 5: ROW EVENT
-  # 6: ROW EVENT
-  # 7: COMMIT
-  #
-  if ($engine == NDB)
-  {
-    let $commit_event_row_number= 7;
-  }
   
   let $first_binlog_position= query_get_value("SHOW MASTER STATUS", Position, 1);
   --enable_query_log
@@ -87,32 +71,10 @@ while ($ddl_cases >= 1)
   if ($ddl_cases == 41)
   {
     let $cmd= LOAD INDEX INTO CACHE nt_1 IGNORE LEAVES;
-    if ($engine == NDB)
-    {
-      # This seems to be related to epochs.
-      # We need to check this against an updated version or avoid it.
-      let $ok= no;
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 40)
   {
     let $cmd= LOAD INDEX INTO CACHE tt_1, tt_2 IGNORE LEAVES;
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 39)
   {
@@ -121,21 +83,6 @@ while ($ddl_cases >= 1)
   if ($ddl_cases == 38)
   {
     let $cmd= CHECK TABLE nt_1;
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 37)
   {
@@ -148,40 +95,10 @@ while ($ddl_cases >= 1)
   if ($ddl_cases == 35)
   {
     let $cmd= LOCK TABLES tt_1 WRITE;
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 34)
   {
     let $cmd= UNLOCK TABLES;
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 33)
   {
@@ -194,42 +111,6 @@ while ($ddl_cases >= 1)
   if ($ddl_cases == 31)
   {
     let $cmd= SET PASSWORD FOR 'user'@'localhost' = PASSWORD('newpass');
-    #
-    # In NDB (RBR mode), the commit event is the eleventh event
-    # in the binary log:
-    #
-    # 1: DDL EVENT which triggered the previous commmit.
-    # 2: BEGIN
-    # 3: TABLE MAP EVENT
-    # 4: ROW EVENT
-    # 5: COMMIT
-    # 6: BEGIN
-    # 7: TABLE MAP EVENT
-    # 8: TABLE MAP EVENT (ndb_apply_status)
-    # 9: ROW EVENT
-    # 10: ROW EVENT
-    # 11: COMMIT
-    #
-    if (`SELECT '$engine' = 'NDB' && @@binlog_format = 'ROW'`)
-    {
-      let $commit_event_row_number= 11;
-    }
-    #
-    # In NDB (MIXED mode), the commit event is the eighth event
-    # in the binary log:
-    #
-    # 1: DDL EVENT which triggered the previous commmit.
-    # 2: BEGIN
-    # 3: TABLE MAP EVENT
-    # 4: TABLE MAP EVENT (ndb_apply_status)
-    # 5: ROW EVENT
-    # 6: ROW EVENT
-    # 7: COMMIT
-    #
-    if (`SELECT '$engine' = 'NDB' && @@binlog_format != 'ROW'`)
-    {
-      let $commit_event_row_number= 7;
-    }
   }
   if ($ddl_cases == 30)
   {
@@ -272,7 +153,7 @@ while ($ddl_cases >= 1)
     # 5: COMMIT
     # 6: DDL EVENT which triggered the previous commmit.
     #
-    if (`select @@binlog_format = 'ROW' && '$engine' != 'NDB'`)
+    if (`select @@binlog_format = 'ROW'`)
     {
       let $commit_event_row_number= 5;
     }
@@ -316,42 +197,10 @@ while ($ddl_cases >= 1)
   if ($ddl_cases == 13)
   {
     let $cmd= CREATE INDEX ix ON tt_1(ddl_case);
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    # 7: DDL EVENT which triggered the previous commmit.
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 12)
   {
     let $cmd= DROP INDEX ix ON tt_1;
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    # 7: DDL EVENT which triggered the previous commmit.
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 11)
   {
@@ -377,39 +226,6 @@ while ($ddl_cases >= 1)
     {
       let $commit_event_row_number= 4;
     }
-    #
-    # In NDB (RBR mode), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    #
-    if (`SELECT '$engine' = 'NDB' && @@binlog_format = 'ROW'` )
-    {
-      let $commit_event_row_number= 6;
-    }
-    #
-    # In NDB (MIXED mode), the commit event is the nineth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: DDL EVENT which triggered the previous commmit.
-    # 3: COMMIT
-    # 4: BEGIN
-    # 5: TABLE MAP EVENT
-    # 6: TABLE MAP EVENT (ndb_apply_status)
-    # 7: ROW EVENT
-    # 8: ROW EVENT
-    # 9: COMMIT
-    #
-    if (`SELECT '$engine' = 'NDB' && @@binlog_format != 'ROW'` )
-    {
-      let $commit_event_row_number= 9;
-    }
   }
   if ($ddl_cases == 10)
   {
@@ -427,21 +243,6 @@ while ($ddl_cases >= 1)
     {
       let $commit_event_row_number= 4;
     }
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 9)
   {
@@ -459,21 +260,6 @@ while ($ddl_cases >= 1)
     {
       let $commit_event_row_number= 4;
     }
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 8)
   {
@@ -514,42 +300,6 @@ while ($ddl_cases >= 1)
     {
       let $commit_event_row_number= 5;
     }
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: DROP TEMPORARY table IF EXISTS
-    # 3: COMMIT
-    # 4: BEGIN
-    # 5: TABLE MAP EVENT
-    # 6: TABLE MAP EVENT (ndb_apply_status)
-    # 7: ROW EVENT
-    # 8: ROW EVENT
-    # 9: COMMIT
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 9;
-    }
-    #
-    # In NDB (MIXED mode), the commit event is the nineth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: DDL EVENT which triggered the previous commmit.
-    # 3: COMMIT
-    # 4: BEGIN
-    # 5: TABLE MAP EVENT
-    # 6: TABLE MAP EVENT (ndb_apply_status)
-    # 7: ROW EVENT
-    # 8: ROW EVENT
-    # 9: COMMIT
-    #
-    if (`SELECT '$engine' = 'NDB' && @@binlog_format != 'ROW'` )
-    {
-      let $commit_event_row_number= 9;
-    }
   }
   if ($ddl_cases == 7)
   {
@@ -574,42 +324,10 @@ while ($ddl_cases >= 1)
   if ($ddl_cases == 2)
   {
     let $cmd= CREATE DATABASE db;
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    # 7: DDL EVENT which triggered the previous commmit.
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   if ($ddl_cases == 1)
   {
     let $cmd= DROP DATABASE IF EXISTS db;
-    #
-    # In NDB (RBR and MIXED modes), the commit event is the sixth event
-    # in the binary log:
-    #
-    # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: TABLE MAP EVENT (ndb_apply_status)
-    # 4: ROW EVENT
-    # 5: ROW EVENT
-    # 6: COMMIT
-    # 7: DDL EVENT which triggered the previous commmit.
-    #
-    if ($engine == NDB)
-    {
-      let $commit_event_row_number= 6;
-    }
   }
   --eval $cmd
   --disable_query_log

mysql-test/extra/rpl_tests/rpl_innodb.test

@@ -48,8 +48,6 @@ connection master;
 #
 #Note Matthias: to be merged to rpl_ddl.test
 
---source include/not_ndb_default.inc
-
 FLUSH LOGS;
 sync_slave_with_master;
 FLUSH LOGS;

mysql-test/extra/rpl_tests/rpl_loadfile.test

@@ -23,10 +23,6 @@ SELECT * FROM test.t1 ORDER BY blob_column;
 save_master_pos;
 sync_slave_with_master;
 connection slave;
-# Need to allow some time when NDB engine is used for
-# the injector thread to have time to populate binlog
-let $wait_condition= SELECT INSTR(blob_column,'aberration') > 0 FROM test.t1 WHERE a = 2;
---source include/wait_condition.inc
 SELECT * FROM test.t1 ORDER BY blob_column;
 
 # Cleanup

mysql-test/extra/rpl_tests/rpl_mixing_engines.test

@@ -12,8 +12,7 @@
 #   used in the same transaction.
 #
 #   * Statements that do an implicit commit (i.e., most but not all DDL, and
-#   some utility commands) are logged specially due to unspecified requirements by
-#   NDB.
+#   some utility commands) are logged specially
 # 
 #   * Statements that update temporary tables need special treatment since they
 #   are not logged in row format.
@@ -147,9 +146,7 @@
 # - Rules for committing statements, except CREATE [TEMPORARY] TABLE...SELECT
 #
 #   * All other statements that have a pre-commit are written directly to the
-#   binlog. (Note: this is semantically equivalent to writing it to the SC and
-#   flushing the SC. However, due to requirements by NDB (which have not been
-#   clarified), we write directly to the binlog.)
+#   binlog.
 #
 # We use the include file rpl_mixing_engines.inc to generate sql commands from a
 # format string. The format string consists of a sequence of 'codes' separated

mysql-test/extra/rpl_tests/rpl_ndb_2multi_basic.test

@@ -1,119 +0,0 @@
-#######################################
-# Author: Rafal Somla                 #
-# Date: 2006-08-20                    #
-# Purpose: Test replication of basic  #
-# table operations in various setups  #   
-#                                     #
-# Based on rpl_ndb_2multi_eng.test by #
-# JBM                                 #
-#######################################
-
---echo --- Doing pre test cleanup --- 
-
-connection master;
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_query_log
-
-#################################################
---echo --- Create Table Section ---
-
-CREATE TABLE t1 (id MEDIUMINT NOT NULL, 
-                 b1 INT, 
-                 vc VARCHAR(255), 
-                 bc CHAR(255), 
-                 d DECIMAL(10,4) DEFAULT 0, 
-                 f FLOAT DEFAULT 0, 
-                 total BIGINT UNSIGNED, 
-                 y YEAR, 
-                 t DATE, 
-                 PRIMARY KEY(id));
-
---echo --- Show table on master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Show table on slave ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---source include/rpl_multi_engine2.inc
-
-#################################################
-# Okay lets see how it holds up to table changes
---echo --- Check that simple Alter statements are replicated correctly --
-
-ALTER TABLE t1 DROP PRIMARY KEY;
-# note: table with no PK can't contain blobs if it is to be replicated.
-ALTER TABLE t1 MODIFY vc char(32);  
-
---echo --- Show the new improved table on the master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Make sure that our tables on slave are still same engine ---
---echo --- and that the alter statements replicated correctly ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---source include/rpl_multi_engine2.inc
-
-#################################################
---echo --- Check that replication works when slave has more columns than master
-connection master;
-ALTER TABLE t1 ADD PRIMARY KEY(id,total);
-ALTER TABLE t1 MODIFY vc TEXT;
-
-INSERT INTO t1 VALUES(3,1,'Testing MySQL databases is a cool ',
-                      'Must make it bug free for the customer',
-                       654321.4321,15.21,0,1965,"1905-11-14");
-INSERT INTO t1 VALUES(20,1,'Testing MySQL databases is a cool ',
-                      'Must make it bug free for the customer',
-                       654321.4321,15.21,0,1965,"1965-11-14");
-INSERT INTO t1 VALUES(50,1,'Testing MySQL databases is a cool ',
-                      'Must make it bug free for the customer',
-                       654321.4321,15.21,0,1965,"1985-11-14");
-
---echo --- Add columns on slave ---
---sync_slave_with_master
-ALTER TABLE t1 ADD (u int, v char(16) default 'default');
-UPDATE t1 SET u=7 WHERE id < 50;
-UPDATE t1 SET v='explicit' WHERE id >10;
-
---echo --- Show changed table on slave ---
-
-SHOW CREATE TABLE t1;
-SELECT * 
-FROM t1
-ORDER BY id;
-
---source include/rpl_multi_engine2.inc
-TRUNCATE TABLE t1;
-
-#################################################
---echo --- Check that replication works when master has more columns than slave
-connection master;
-
---echo --- Remove columns on slave ---
---sync_slave_with_master
-ALTER TABLE t1 DROP COLUMN v;
-ALTER TABLE t1 DROP COLUMN u;
-ALTER TABLE t1 DROP COLUMN t;
-ALTER TABLE t1 DROP COLUMN y;
-
---echo --- Show changed table on slave ---
-
-SHOW CREATE TABLE t1;
-
---source include/rpl_multi_engine2.inc
-TRUNCATE TABLE t1;
-
-#################################################
---echo --- Do Cleanup --
-connection master;
-DROP TABLE IF EXISTS t1;
-
-sync_slave_with_master;
-connection master;

mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test

@@ -1,347 +0,0 @@
-#######################################
-# Author: JBM                         #
-# Date: 2006-02-23                    #
-# Purpose: See if replication between #
-# NDB -> MyISAM and InnoDB works.     #
-# and if                              #   
-# MyISAM and InnoDB -> NDB works.     #
-#######################################
-# By JBM                              #
-# Date 2006-02-28                     #
-# Change: Implemented review comments #
-#######################################
-
---echo --- Doing pre test cleanup --- 
-
-connection master;
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_query_log
-
---echo --- Start test 1 Basic testing ---
---echo --- Create Table Section ---
-
-#################################################
-# Requirment: Create basic table, replicate     #
-# basice operations such at insert, update      #
-# delete between 2 different storage engines    #
-# Alter table and ensure table is handled       #
-# Correctly on the slave                        #
-#################################################
-
-CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc VARCHAR(255), 
-                 bc CHAR(255), d DECIMAL(10,4) DEFAULT 0, 
-                 f FLOAT DEFAULT 0, total BIGINT UNSIGNED, 
-                 y YEAR, t DATE,PRIMARY KEY(id));
-
---echo --- Show table on master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Show table on slave ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
-# Okay lets see how it holds up to table changes
---echo --- Check that simple Alter statements are replicated correctly --
-
-ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(id, total);
-ALTER TABLE t1 MODIFY vc TEXT;
-
---echo --- Show the new improved table on the master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Make sure that our tables on slave are still same engine ---
---echo --- and that the alter statements replicated correctly ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly --- 
-
---source include/rpl_multi_engine3.inc
-
---echo --- End test 1 Basic testing ---
---echo --- Do Cleanup --
-
-DROP TABLE IF EXISTS t1;
-
-#################################################################
-
---echo --- Start test 2 partition RANGE testing --
---echo --- Do setup --
-
-
-#################################################
-# Requirment: Create table that is partitioned  #
-# by range on year i.e. year(t) and replicate   #
-# basice operations such at insert, update      #
-# delete between 2 different storage engines    #
-# Alter table and ensure table is handled       #
-# Correctly on the slave                        #
-#################################################
-
-CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc VARCHAR(255), 
-                 bc CHAR(255), d DECIMAL(10,4) DEFAULT 0, 
-                 f FLOAT DEFAULT 0, total BIGINT UNSIGNED, 
-                 y YEAR, t DATE)
-                 PARTITION BY RANGE (YEAR(t)) 
-                (PARTITION p0 VALUES LESS THAN (1901), 
-                 PARTITION p1 VALUES LESS THAN (1946),  
-                 PARTITION p2 VALUES LESS THAN (1966), 
-                 PARTITION p3 VALUES LESS THAN (1986), 
-                 PARTITION p4 VALUES LESS THAN (2005), 
-                 PARTITION p5 VALUES LESS THAN MAXVALUE);
-
---echo --- Show table on master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Show table on slave --
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
---echo --- Check that simple Alter statements are replicated correctly ---
-
-ALTER TABLE t1 ADD PRIMARY KEY(t,id);
-ALTER TABLE t1 MODIFY vc TEXT;
-
---echo --- Show the new improved table on the master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Make sure that our tables on slave are still same engine ---
---echo --- and that the alter statements replicated correctly ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
---enable_query_log
-
---source include/rpl_multi_engine3.inc
-
---echo --- End test 2 partition RANGE testing ---
---echo --- Do Cleanup ---
-
-DROP TABLE IF EXISTS t1;
-
-########################################################
-
---echo --- Start test 3 partition LIST testing ---
---echo --- Do setup ---
-#################################################
-# Requirment: Create table that is partitioned  #
-# by list on id i.e. (2,4). Pretend that we     #
-# missed one and alter to add. Then  replicate  #
-# basice operations such at insert, update      #
-# delete between 2 different storage engines    #
-# Alter table and ensure table is handled       #
-# Correctly on the slave                        #
-#################################################
-
-
-CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc VARCHAR(255), 
-                 bc CHAR(255), d DECIMAL(10,4) DEFAULT 0, 
-                 f FLOAT DEFAULT 0, total BIGINT UNSIGNED, 
-                 y YEAR, t DATE)
-                 PARTITION BY LIST(id) 
-                (PARTITION p0 VALUES IN (2, 4), 
-                 PARTITION p1 VALUES IN (42, 142));
-
---echo --- Test 3 Alter to add partition ---
-
-ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES IN (412));
-
---echo --- Show table on master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Show table on slave ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
---echo --- Check that simple Alter statements are replicated correctly ---
-
-ALTER TABLE t1 ADD PRIMARY KEY(id);
-ALTER TABLE t1 MODIFY vc TEXT;
-
---echo --- Show the new improved table on the master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Make sure that our tables on slave are still same engine ---
---echo --- and that the alter statements replicated correctly ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
---echo --- End test 3 partition LIST testing ---
---echo --- Do Cleanup --
-
-DROP TABLE IF EXISTS t1;
-
-########################################################
-
---echo --- Start test 4 partition HASH testing ---
---echo --- Do setup ---
-#################################################
-# Requirment: Create table that is partitioned  #
-# by hash on year i.e. YEAR(t). Then replicate  #
-# basice operations such at insert, update      #
-# delete between 2 different storage engines    #
-# Alter table and ensure table is handled       #
-# Correctly on the slave                        #
-#################################################
-
-
-CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc VARCHAR(255), 
-                 bc CHAR(255), d DECIMAL(10,4) DEFAULT 0, 
-                 f FLOAT DEFAULT 0, total BIGINT UNSIGNED, 
-                 y YEAR, t DATE)
-                 PARTITION BY HASH( YEAR(t) ) 
-                 PARTITIONS 4; 
-
---echo --- show that tables have been created correctly ---
-
-SHOW CREATE TABLE t1;
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
---echo --- Check that simple Alter statements are replicated correctly ---
-
-ALTER TABLE t1 ADD PRIMARY KEY(t,id);
-ALTER TABLE t1 MODIFY vc TEXT;
-
---echo --- Show the new improved table on the master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Make sure that our tables on slave are still same engine ---
---echo --- and that the alter statements replicated correctly ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
---echo --- End test 4 partition HASH testing ---
---echo --- Do Cleanup --
-
-DROP TABLE IF EXISTS t1;
-
-########################################################
-
---echo --- Start test 5 partition by key testing ---
---echo --- Create Table Section ---
-
-#################################################
-# Requirment: Create table that is partitioned  #
-# by key on id with 4 parts.    Then replicate  #
-# basice operations such at insert, update      #
-# delete between 2 different storage engines    #
-# Alter table and ensure table is handled       #
-# Correctly on the slave                        #
-#################################################
-
-CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc VARCHAR(255), 
-                 bc CHAR(255), d DECIMAL(10,4) DEFAULT 0, 
-                 f FLOAT DEFAULT 0, total BIGINT UNSIGNED, 
-                 y YEAR, t DATE,PRIMARY KEY(id))
-                 PARTITION BY KEY() 
-                 PARTITIONS 4;
-
---echo --- Show that tables on master are ndbcluster tables ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Show that tables on slave ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
-# Okay lets see how it holds up to table changes
---echo --- Check that simple Alter statements are replicated correctly ---
-
-ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(id, total);
-
---echo --- Show the new improved table on the master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Make sure that our tables on slave are still right type ---
---echo --- and that the alter statements replicated correctly ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
---echo --- Check that simple Alter statements are replicated correctly ---
-
-ALTER TABLE t1 MODIFY vc TEXT;
-
---echo --- Show the new improved table on the master ---
-
-SHOW CREATE TABLE t1;
-
---echo --- Make sure that our tables on slave are still same engine ---
---echo --- and that the alter statements replicated correctly ---
-
-sync_slave_with_master;
-SHOW CREATE TABLE t1;
-
---echo --- Perform basic operation on master ---
---echo --- and ensure replicated correctly ---
-
---source include/rpl_multi_engine3.inc
-
---echo --- End test 5 key partition testing ---
---echo --- Do Cleanup ---
-
-DROP TABLE IF EXISTS t1;
-sync_slave_with_master;
-
-# End of 5.1 test case

mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test

@@ -1,307 +0,0 @@
-#############################################
-#Authors:    TU and Jeb
-#Date:       2007/04
-#Purpose:    Generic replication to cluster
-#            and ensuring that the ndb_apply_status
-#            table is updated.
-#############################################
-# Notes: 
-# include/select_ndb_apply_status.inc
-# Selects out the log name, start & end pos
-# from the ndb_apply_status table
-#
-# include/show_binlog_using_logname.inc
-# To select out 1 row from offset 1
-# from the start position in the binlog whose
-# name is = log_name
-#
-# include/tpcb.inc
-# Creates DATABASE tpcb, the tables and 
-# stored procedures for loading the DB
-# and for running transactions against DB.
-##############################################
-
-
---echo
---echo *** Test 1 ***
---echo
-
-connection master;
-create table t1 (a int key, b int) engine innodb;
-create table t2 (a int key, b int) engine innodb;
-
---echo
-
---sync_slave_with_master
-alter table t1 engine ndb;
-alter table t2 engine ndb;
-
---echo
-
-# check binlog position without begin
-connection master;
-insert into t1 values (1,2);
-
---echo
-
---sync_slave_with_master
---source include/select_ndb_apply_status.inc
-
---echo
-
-connection master;
---echo # Now check that that is in the apply_status table is consistant
---echo # with what is in the binlog
---echo
---echo # since insert is done with transactional engine, expect a BEGIN
---echo # at <start_pos>
---echo
---let $binlog_start= $start_pos
---let $binlog_limit= 1
---source include/show_binlog_events.inc
-
---echo
---echo # Now the insert, one step after
---echo
---let $binlog_start= $start_pos
---let $binlog_limit= 1,1
---source include/show_binlog_events.inc
-
---echo
---echo # and the COMMIT should be at <end_pos>
---echo
---let $binlog_start= $start_pos
---let $binlog_limit= 2,1
---source include/show_binlog_events.inc
-
---echo
-
-# check binlog position with begin
-begin;
-insert into t1 values (2,3);
-insert into t2 values (3,4);
-commit;
-
---echo
-
---sync_slave_with_master
---source include/select_ndb_apply_status.inc
-
-connection master;
---let $binlog_start= $start_pos
---let $binlog_limit= 1
---source include/show_binlog_events.inc
---echo
---let $binlog_start= $start_pos
---let $binlog_limit= 1,2
---source include/show_binlog_events.inc
---echo
---let $binlog_start= $start_pos
---let $binlog_limit= 3,1
---source include/show_binlog_events.inc
-
---echo
-
-connection master;
-DROP TABLE test.t1, test.t2;
---sync_slave_with_master
-SHOW TABLES;
-
-# Run in some transactions using stored procedures
-# and ensure that the ndb_apply_status table is 
-# updated to show the transactions
-
-
---echo
---echo *** Test 2 ***
---echo
-
-# Create database/tables and stored procdures
-connection master;
---source include/tpcb.inc
-
-# Switch tables on slave to use NDB 
---sync_slave_with_master
-USE tpcb;
-ALTER TABLE account ENGINE NDB;
-ALTER TABLE branch ENGINE NDB;
-ALTER TABLE teller ENGINE NDB;
-ALTER TABLE history ENGINE NDB;
-
---echo
-
-# Load DB tpcb and run some transactions
-connection master;
---disable_query_log
-CALL tpcb.load();
-SET AUTOCOMMIT=0;
-let $run= 5;
-while ($run)
-{
- START TRANSACTION;
- --disable_warnings
- --eval CALL tpcb.trans($rpl_format);
- --enable_warnings
- eval SET @my_errno= $mysql_errno;
- let $run_good= `SELECT @my_errno = 0`;
- let $run_bad= `SELECT @my_errno <> 0`;
- if ($run_good)
- {
-   COMMIT;
- }
- if ($run_bad)
- {
-   ROLLBACK;
- }
- dec $run;
-}
-
-SET AUTOCOMMIT=1;
---enable_query_log
-
---sync_slave_with_master
---source include/select_ndb_apply_status.inc
-
---echo
-
-connection master;
---source  include/show_binlog_using_logname.inc
-
-# Flush the logs on the master moving all
-# Transaction to a new binlog and ensure
-# that the ndb_apply_status table is updated
-# to show the use of the new binlog.
-
---echo
---echo ** Test 3 **
---echo
-
-# Flush logs on master which should force it
-# to switch to binlog #2
-
-FLUSH LOGS;
-
-# Run in some transaction to increase end pos in
-# binlog
-
---disable_query_log
-SET AUTOCOMMIT=0;
-let $run= 5;
-while ($run)
-{
- START TRANSACTION;
- --disable_warnings
- --eval CALL tpcb.trans($rpl_format);
- --enable_warnings
- eval SET @my_errno= $mysql_errno;
- let $run_good= `SELECT @my_errno = 0`;
- let $run_bad= `SELECT @my_errno <> 0`;
- if ($run_good)
- {
-   COMMIT;
- }
- if ($run_bad)
- {
-   ROLLBACK;
- }
- dec $run;
-}
-SET AUTOCOMMIT=1;
---enable_query_log
-
---echo
-
---sync_slave_with_master
---source include/select_ndb_apply_status.inc
-
---echo
-
-connection master;
---source  include/show_binlog_using_logname.inc
-
-# Now we reset both the master and the slave
-# Run some more transaction and ensure
-# that the ndb_apply_status is updated
-# correctly
-
---echo
---echo ** Test 4 **
---echo
-
-# Reset both slave and master
-# This should reset binlog to #1
---source include/rpl_reset.inc
-
---echo
-
-# Run in some transactions and check
-connection master;
---disable_query_log
-SET AUTOCOMMIT=0;
-let $run= 5;
-while ($run)
-{
- START TRANSACTION;
- --disable_warnings
- --eval CALL tpcb.trans($rpl_format);
- --enable_warnings
- eval SET @my_errno= $mysql_errno;
- let $run_good= `SELECT @my_errno = 0`;
- let $run_bad= `SELECT @my_errno <> 0`;
- if ($run_good)
- {
-   COMMIT;
- }
- if ($run_bad)
- {
-   ROLLBACK;
- }
- dec $run;
-}
-SET AUTOCOMMIT=1;
---enable_query_log
-
---sync_slave_with_master
---source include/select_ndb_apply_status.inc
-
---echo
-
-connection master;
---source include/show_binlog_using_logname.inc
-
-# Since we are doing replication, it is a good
-# idea to check to make sure all data was 
-# Replicated correctly
-
---echo
---echo *** DUMP MASTER & SLAVE FOR COMPARE ********
-
---exec $MYSQL_DUMP -n -t --compact --order-by-primary --skip-extended-insert tpcb account teller branch history > $MYSQLTEST_VARDIR/tmp/master_apply_status.sql
-
---exec $MYSQL_DUMP_SLAVE -n -t --compact --order-by-primary --skip-extended-insert tpcb account teller branch history > $MYSQLTEST_VARDIR/tmp/slave_apply_status.sql
-
-connection master;
-DROP DATABASE tpcb;
-
---sync_slave_with_master
-
-####### Commenting out until decision on Bug#27960 ###########
-
-#--source include/select_ndb_apply_status.inc
-
-#connection master;
-#--eval SHOW BINLOG EVENTS in '$log_name' from $start_pos
-#--source include/show_binlog_using_logname.inc
-
---echo ****** Do dumps compare ************
-
-
-diff_files $MYSQLTEST_VARDIR/tmp/master_apply_status.sql $MYSQLTEST_VARDIR/tmp/slave_apply_status.sql;
-
-## Note: Ths files should only get removed, if the above diff succeeds.
-
---exec rm $MYSQLTEST_VARDIR/tmp/master_apply_status.sql
---exec rm $MYSQLTEST_VARDIR/tmp/slave_apply_status.sql
-
-
-# End of 5.1 Test

mysql-test/extra/rpl_tests/rpl_partition.test

@@ -201,11 +201,11 @@ CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc VARCHAR(255),
                  PARTITION BY KEY() 
                  PARTITIONS 4;
 
---echo --- Show that tables on master are ndbcluster tables ---
+--echo --- Show tables on master ---
 
 SHOW CREATE TABLE t1;
 
---echo --- Show that tables on slave ---
+--echo --- Show tables on slave ---
 
 sync_slave_with_master;
 SHOW CREATE TABLE t1;

mysql-test/extra/rpl_tests/rpl_row_blob.test

@@ -36,7 +36,6 @@ SELECT LENGTH(data) FROM test.t1 WHERE c1 = 3;
 save_master_pos;
 connection slave;
 sync_with_master; 
---source include/wait_for_ndb_to_binlog.inc
 --echo
 --echo **** Data Insert Validation Slave Section test.t1 ****
 --echo
@@ -59,7 +58,6 @@ SELECT LENGTH(data) FROM test.t1 WHERE c1 = 2;
 save_master_pos;
 connection slave;
 sync_with_master; 
---source include/wait_for_ndb_to_binlog.inc
 --echo
 --echo **** Data Update Validation Slave Section test.t1 ****
 --echo
@@ -130,7 +128,6 @@ FROM test.t2 WHERE c1=2;
 save_master_pos;
 connection slave;
 sync_with_master; 
---source include/wait_for_ndb_to_binlog.inc
 --echo
 --echo **** Data Insert Validation Slave Section test.t2 ****
 --echo
@@ -156,7 +153,6 @@ FROM test.t2 WHERE c1=2;
 save_master_pos;
 connection slave;
 sync_with_master; 
---source include/wait_for_ndb_to_binlog.inc
 --echo
 --echo **** Data Update Validation Slave Section test.t2 ****
 --echo
@@ -176,8 +172,4 @@ diff_files $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql $MYSQLTEST_VARDIR/tmp/r
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
 # ensure cleanup on slave as well:
-# ndb blob tables consist of several tables
-# if cluster is shutdown while not all tables are
-# properly dropped, the table becomes inconsistent
-# and wrecks later test cases
 --sync_slave_with_master

mysql-test/extra/rpl_tests/rpl_row_func003.test

@@ -54,11 +54,8 @@ INSERT INTO test.t1 VALUES (null,test.f1());
 ROLLBACK;
 SET AUTOCOMMIT=1;
 
-# Sync master and slave for all engines except NDB
-if (`SELECT UPPER(LEFT('$engine_type', 3)) != 'NDB'`) {
   sync_slave_with_master;
   connection master;
-}
 
 # Time to dump the databases and so we can see if they match
 

mysql-test/extra/rpl_tests/rpl_row_sp003.test

@@ -53,8 +53,6 @@ SELECT release_lock("test");
 
 connection master;
 SELECT * FROM test.t1; 
-#show binlog events;
---source include/wait_for_ndb_to_binlog.inc
 sync_slave_with_master;
 connection slave;
 SELECT * FROM test.t1;

mysql-test/extra/rpl_tests/rpl_sv_relay_space.test

@@ -8,8 +8,6 @@ SHOW VARIABLES LIKE 'relay_log_space_limit';
 # Matz says: I have no idea what this is supposed to test, but it has
 # potential for generating different results with some storage engines
 # that process rows in an order not dependent on the insertion order.
-# For instance, I would assume that distributed storage engines (like
-# NDB) could process rows based on locality.
 
 eval CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=$engine_type;
 INSERT INTO t1 SET name='Andy', age=31;

mysql-test/extra/rpl_tests/rpl_trig004.test

@@ -7,7 +7,6 @@
 #############################################################################
 # Change Auth: JBM                                 #
 # Date: 2006-02-14                                 #
-# Change: Added error, sleep and comments (ndb)    #
 ####################################################
 
 # Begin clean up test section
@@ -28,15 +27,12 @@ CREATE TRIGGER test.t1_bi_t2 BEFORE INSERT ON test.t2 FOR EACH ROW INSERT INTO t
 delimiter ;//
 
 INSERT INTO test.t2 VALUES (1, 0.0);
-# Expect duplicate error 1022 == ndb
---error 1022, ER_DUP_ENTRY
+--error ER_DUP_ENTRY
 INSERT INTO test.t2 VALUES (1, 0.0);
 
 #show binlog events; 
 select * from test.t1;
 select * from test.t2;
-let $wait_time= 10;
---source include/wait_for_ndb_to_binlog.inc
 sync_slave_with_master;
 connection slave;
 select * from test.t1;

mysql-test/include/ctype_utf8mb4.inc

@@ -191,17 +191,9 @@ drop table t1;
 #
 if(!$is_heap)
 {
-if(!$is_ndb)
-{
 --error ER_TOO_LONG_KEY
 eval create table t1 (a text character set utf8mb4, primary key(a(371))) engine $engine;
 }
-if($is_ndb)
-{
---error ER_BLOB_USED_AS_KEY
-eval create table t1 (a text character set utf8mb4, primary key(a(371))) engine $engine;
-}
-}
 
 #
 # Bug 2959
@@ -254,8 +246,6 @@ drop table t2;
 # Bug 4521: unique key prefix interacts poorly with utf8mb4
 # MYISAM: keys with prefix compression, case insensitive collation.
 #
-if (!$is_ndb)
-{
 eval create table t1 (c varchar(30) character set utf8mb4, unique(c(10))) engine $engine;
 insert into t1 values ('1'),('2'),('3'),('x'),('y'),('z');
 insert into t1 values ('aaaaaaaaaa');
@@ -549,7 +539,6 @@ select c as c_all from t1 order by c;
 select c as c_a from t1 where c='a';
 select c as c_a from t1 where c='б';
 drop table t1;
-}
 
 
 # Bug#4594: column index make = failed for gbk, but like works
@@ -593,8 +582,6 @@ drop table t1;
 # the same for HEAP+HASH
 #
 
-if (!$is_ndb)
-{
 eval create table t1 (
   str varchar(255) character set utf8mb4 not null,
   key str using hash (str(2))
@@ -618,7 +605,6 @@ INSERT INTO t1 VALUES ('str');
 INSERT INTO t1 VALUES ('str2');
 select * from t1 where str='str';
 drop table t1;
-}
 
 #
 # Bug #5397: Crash with varchar binary and LIKE
@@ -651,8 +637,6 @@ DROP TABLE t1;
 #
 if (!$is_heap)
 {
-if (!$is_ndb)
-{
 eval CREATE TABLE t1 (
     id       int unsigned NOT NULL auto_increment,
     list_id  smallint unsigned NOT NULL,
@@ -689,7 +673,6 @@ SELECT id, term FROM t1 where (list_id = 1) AND (term = "testetest");
 SELECT id, term FROM t1 where (list_id = 1) AND (term = "testètest");
 DROP TABLE t1;
 }
-}
 
 #
 # Bug #6019 SELECT tries to use too short prefix index on utf8mb4 data
@@ -979,14 +962,7 @@ if (!$is_heap)
 #
 eval CREATE TABLE t1 (t TINYTEXT CHARACTER SET utf8mb4) ENGINE $engine;
 INSERT INTO t1 VALUES(REPEAT('a', 100));
-if (!$is_ndb)
-{
 eval CREATE TEMPORARY TABLE t2 ENGINE $engine SELECT COALESCE(t) AS bug FROM t1;
-}
-if ($is_ndb)
-{
-eval CREATE TABLE t2 ENGINE $engine SELECT COALESCE(t) AS bug FROM t1;
-}
 SELECT LENGTH(bug) FROM t2;
 DROP TABLE t2;
 DROP TABLE t1;
@@ -1202,8 +1178,6 @@ SET NAMES latin2;
 
 if (!$is_heap)
 {
-if (!$is_ndb)
-{
 eval CREATE TABLE t1 (
   id int(11) NOT NULL default '0',
   tid int(11) NOT NULL default '0',
@@ -1229,7 +1203,6 @@ SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN
 
 DROP TABLE t1;
 }
-}
 
 #
 # Bug 20709: problem with utf8mb4 fields in temporary tables
@@ -1318,8 +1291,6 @@ drop table t1;
 #
 # Check that do_varstring2_mb produces a warning
 #
-if (!$is_ndb)
-{
 eval create table t1 (
   a varchar(4000) not null
 ) default character set utf8mb4 engine $engine;
@@ -1327,7 +1298,6 @@ insert into t1 values (repeat('a',4000));
 alter table t1 change a a varchar(3000) character set utf8mb4 not null;
 select length(a) from t1;
 drop table t1;
-}
 
 #
 #  Bug#10504: Character set does not support traditional mode
@@ -1614,8 +1584,6 @@ set max_sort_length=default;
 --echo #
 if (!$is_heap)
 {
-if (!$is_ndb)
-{
 eval CREATE TABLE t1 (
   clipid INT NOT NULL,
   Tape TINYTEXT,
@@ -1626,7 +1594,6 @@ ALTER TABLE t1 ADD mos TINYINT DEFAULT 0 AFTER clipid;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 }
-}
 
 #--echo #
 #--echo # Check that supplementary characters are not allowed in identifiers
@@ -1807,12 +1774,9 @@ INSERT INTO t2 VALUES (x'ea9da8');
 SELECT HEX(CONCAT(utf8mb4, utf8mb3)) FROM t1,t2 ORDER BY 1;
 SELECT CHARSET(CONCAT(utf8mb4, utf8mb3)) FROM t1, t2 LIMIT 1;
 
-if (!$is_ndb)
-{
 eval CREATE TEMPORARY TABLE t3 ENGINE $engine AS SELECT *, concat(utf8mb4,utf8mb3) FROM t1, t2;
 SHOW CREATE TABLE t3;
 DROP TEMPORARY TABLE t3;
-}
 
 SELECT * FROM t1, t2 WHERE t1.utf8mb4 > t2.utf8mb3;
 SELECT * FROM t1, t2 WHERE t1.utf8mb4 = t2.utf8mb3;

mysql-test/include/default_ndbd.cnf

@@ -1,27 +0,0 @@
-
-[cluster_config]
-MaxNoOfSavedMessages=          1000
-MaxNoOfConcurrentTransactions= 128
-MaxNoOfConcurrentOperations=   10000
-DataMemory=                    20M
-IndexMemory=                   1M
-Diskless=                      0
-TimeBetweenWatchDogCheck=      30000
-MaxNoOfOrderedIndexes=         32
-MaxNoOfAttributes=             2048
-TimeBetweenGlobalCheckpoints=  500
-NoOfFragmentLogFiles=          4
-FragmentLogFileSize=           12M
-DiskPageBufferMemory=          4M
-
-# O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612
-#ODirect= 1
-# the following parametes just function as a small regression
-# test that the parameter exists
-InitialNoOfOpenFiles= 27
-
-# Increase timeouts for slow test-machines
-HeartbeatIntervalDbDb=         30000
-HeartbeatIntervalDbApi=        30000
-
-#TransactionDeadlockDetectionTimeout= 7500

mysql-test/include/have_multi_ndb.inc

@@ -1,52 +0,0 @@
-# Setup connections to both MySQL Servers connected to the cluster
-connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,);
-connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,);
-
-# Check that server1 has NDB  support
-connection server1;
-let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'ENGINES', Tables_in_information_schema (ENGINES), 1);
-disable_query_log;
-if (`SELECT 1 FROM dual WHERE '$engines_table' = 'engines'`)
-{
---require r/true.require
-SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster';
---source include/ndb_not_readonly.inc
-}
-enable_query_log;
-
-# Check that server2 has NDB support
-connection server2;
-let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'ENGINES', Tables_in_information_schema (ENGINES), 1);
-disable_query_log;
-if (`SELECT 1 FROM dual WHERE '$engines_table' = 'engines'`)
-{
---require r/true.require
-SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster';
---source include/ndb_not_readonly.inc
-}
-enable_query_log;
-
-# cleanup
-
-connection server1;
-disable_query_log;
-disable_warnings;
---error 0,1051
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
-flush tables;
-flush status;
-enable_warnings;
-enable_query_log;
-
-connection server2;
-disable_query_log;
-disable_warnings;
---error 0,1051
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
-flush tables;
-flush status;
-enable_warnings;
-enable_query_log;
-
-# Set the default connection
-connection server1;

mysql-test/include/have_ndb.inc

@@ -1,2 +0,0 @@
-# Check that server is compiled and started with support for NDB
---source include/have_multi_ndb.inc

mysql-test/include/have_ndb_extra.inc

@@ -1,2 +0,0 @@
--- require r/have_ndb_extra.require
-eval select $NDB_EXTRA_TEST;

mysql-test/include/have_ndbapi_examples.inc

@@ -1,4 +0,0 @@
---require r/have_ndbapi_examples.require
-disable_query_log;
-eval select LENGTH('$NDB_EXAMPLES_BINARY') > 0 as 'have_ndb_example';
-enable_query_log;

mysql-test/include/loaddata_autocom.inc

@@ -1,5 +1,4 @@
 # Test if the engine does autocommit in LOAD DATA INFILE, or not
-# (NDB wants to do, others don't).
 
 eval SET SESSION STORAGE_ENGINE = $engine_type;
 
@@ -9,8 +8,6 @@ drop table if exists t1;
 
 let $load_file= $MYSQLTEST_VARDIR/std_data/loaddata2.dat;
 
-# NDB does not support the create option 'Binlog of table with BLOB attribute and no PK'
-# So use a dummy PK here.
 create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
 start transaction;
 --replace_result $load_file LOAD_FILE

mysql-test/include/mtr_check.sql

@@ -47,7 +47,7 @@ BEGIN
   -- Show "mysql" database, tables and columns
   SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql
     FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'
+      WHERE table_schema='mysql'
         ORDER BY tables_in_mysql;
   SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql,
   	 column_name, ordinal_position, column_default, is_nullable,
@@ -55,7 +55,7 @@ BEGIN
          numeric_precision, numeric_scale, character_set_name,
          collation_name, column_type, column_key, extra, column_comment
     FROM INFORMATION_SCHEMA.COLUMNS
-      WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'
+      WHERE table_schema='mysql'
         ORDER BY columns_in_mysql;
 
   -- Dump all events, there should be none

mysql-test/include/mtr_warnings.sql

@@ -115,9 +115,6 @@ INSERT INTO global_suppressions VALUES
  ("unknown variable 'loose-"),
  ("You have forced lower_case_table_names to 0 through a command-line option"),
  ("Setting lower_case_table_names=2"),
- ("NDB Binlog:"),
- ("NDB: failed to setup table"),
- ("NDB: only row based binary logging"),
  ("Neither --relay-log nor --relay-log-index were used"),
  ("Query partially completed"),
  ("Slave I.O thread aborted while waiting for relay log"),
@@ -139,7 +136,6 @@ INSERT INTO global_suppressions VALUES
  ("Slave: The incident LOST_EVENTS occured on the master"),
  ("Slave: Unknown error.* 1105"),
  ("Slave: Can't drop database.* database doesn't exist"),
- ("Time-out in NDB"),
  ("Warning:\s+One can only use the --user.*root"),
  ("Warning:\s+Table:.* on (delete|rename)"),
  ("You have an error in your SQL syntax"),

mysql-test/include/ndb_backup.inc

@@ -1,48 +0,0 @@
-######################################################
-# By JBM 2006-02-16 So that the code is not repeated #
-# in test cases and can be reused.                   #
-######################################################
-
---exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "start backup" >> $NDB_TOOLS_OUTPUT
-
-# To find the backupid, we must dump this data to a table, and SELECT
-# what we want into an outfile.  This could be accomplished with grep, but
-# grep isn't Windows-portable
-
---disable_query_log
-# create a table to help us out
---disable_warnings # leave this on until done with the entire process
-# cleanup
-DROP TABLE IF EXISTS helper1;
-CREATE TABLE helper1(c1 VARCHAR(20));
-# dump raw data to file
-let $ndb_backup_file1= $MYSQLTEST_VARDIR/ndb_backup_tmp.dat;
-let $ndb_backup_file2= $MYSQLTEST_VARDIR/tmp.dat;
---disable_warnings
---error 0,1
---remove_file $ndb_backup_file1
---enable_warnings
---exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="$NDB_CONNECTSTRING" -d sys --delimiter=',' SYSTAB_0 > $ndb_backup_file1
-# load the table from the raw data file
-eval LOAD DATA INFILE '$ndb_backup_file1' INTO TABLE helper1;
---remove_file $ndb_backup_file1
-# output what we need
-eval SELECT * FROM helper1 WHERE c1 LIKE '%520093696%'
-INTO OUTFILE '$ndb_backup_file2';
-# cleanup
-DROP TABLE helper1;
---enable_warnings
---enable_query_log
-
-CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info
-(id INT, backup_id INT) ENGINE = MEMORY;
-
---replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval LOAD DATA INFILE '$ndb_backup_file2' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
---remove_file $ndb_backup_file2
-
-# Load backup id into environment variable
-let the_backup_id=`SELECT  backup_id from test.backup_info`;
-
-DROP TABLE test.backup_info;
-

mysql-test/include/ndb_backup_print.inc

@@ -1,9 +0,0 @@
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat
---exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat
---disable_warnings
---error 0,1
---remove_file $MYSQLTEST_VARDIR/tmp/tmp.dat
---enable_warnings
---let ndb_restore_opts=
---let ndb_restore_filter=

mysql-test/include/ndb_default_cluster.inc

@@ -1,4 +0,0 @@
--- require r/ndb_default_cluster.require
-disable_query_log;
-show status like "Ndb_config_from_host";
-enable_query_log;

mysql-test/include/ndb_master-slave.inc

@@ -1,12 +0,0 @@
---source include/master-slave.inc
-
-connection slave;
-# Check that server is compiled and started with support for NDB
-disable_query_log;
---require r/true.require
-select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster';
---source include/ndb_not_readonly.inc
-enable_query_log;
-
-# Set the default connection to 'master'
-connection master;

mysql-test/include/ndb_master-slave_2ch.inc

@@ -1,67 +0,0 @@
-# ==== Purpose ====
-#
-# Set up circular cluster replication where each 
-# cluster has two mysqlds and replication directions are 
-# following:
-#          master ---> slave  
-#           /            \
-#     cluster A        cluster B
-#           \            /
-#         master1 <--- slave1
-#
-# ==== Usage ====
-#
-#   [--let $rpl_server_count= N]
-#   [--let $rpl_skip_check_server_ids= 1]
-#   [--let $rpl_skip_reset_master_and_slave= 1]
-#   [--let $rpl_skip_change_master= 1]
-#   [--let $rpl_skip_start_slave= 1]
-#   [--let $rpl_debug= 1]
-#   [--let $slave_timeout= NUMBER]
-#   --source include/ndb_master-slave_2ch.inc
-#
-# Parameters:
-#   $rpl_server_count, $rpl_skip_check_server_ids,
-#   $rpl_skip_reset_master_and_slave, $rpl_skip_change_master,
-#   $rpl_skip_start_slave, $rpl_debug, $slave_timeout
-#     See include/master-slave.inc
-
---let $rpl_topology= 1->2,4->3
---let $rpl_skip_check_server_ids= 1
---source include/rpl_init.inc
-
-# Make connections to mysqlds
-
---let $rpl_connection_name= master
---let $rpl_server_number= 1
---source include/rpl_connect.inc
-
---let $rpl_connection_name= master1
---let $rpl_server_number= 1
---source include/rpl_connect.inc
-
---let $rpl_connection_name= slave
---let $rpl_server_number= 2
---source include/rpl_connect.inc
-
---let $rpl_connection_name= slave1
---let $rpl_server_number= 2
---source include/rpl_connect.inc
-
-
-# Check that all mysqld are compiled with ndb support
---let $_rpl_server= 4
-while ($_rpl_server)
-{
-  --connection server_$_rpl_server
-  if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'ndbcluster' AND (support = 'YES' OR support = 'DEFAULT')`)
-  {
-    --skip Test requires NDB.
-  }
-  --source include/ndb_not_readonly.inc
-  --dec $_rpl_server
-}
-
-
-# Set the default connection to 'master' (cluster A)
-connection master;

mysql-test/include/ndb_not_readonly.inc

@@ -1,36 +0,0 @@
-# Check that server has come out ot readonly mode
-#
-# wait for server to connect properly to cluster
-#
-
---disable_query_log
-
-set @saved_log = @@sql_log_bin;
-set sql_log_bin = 0;
---error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND
-delete from mysql.ndb_apply_status where server_id=0;
-let $mysql_errno= 1;
-let $counter= 600;
-while ($mysql_errno)
-{
-  # Table is readonly until the mysqld has connected properly
-  --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG
-  replace into mysql.ndb_apply_status values(0,0,"",0,0);
-  if ($mysql_errno)
-  {
-    if (!$counter)
-    {
-      die Failed while waiting for mysqld to come out of readonly mode;
-    }
-    dec $counter;
-    --sleep 0.1
-  }
-}
-delete from mysql.ndb_apply_status where server_id=0;
-set sql_log_bin = @saved_log;
-
---enable_query_log
-
-#
-# connected
-#

mysql-test/include/ndb_restore_master.inc

@@ -1,8 +0,0 @@
-######################################################
-# By JBM 2006-02-16 So that the code is not repeated #
-# in test cases and can be reused.                   #
-######################################################
-
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
-
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -p 8 -b $the_backup_id -n 2  -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT

mysql-test/include/ndb_restore_slave_eoption.inc

@@ -1,11 +0,0 @@
-######################################################
-# By JBM 2006-03-08 So that the code is not repeated #
-# in test cases and can be reused.                   #
-######################################################
-
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
-
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
-
-
-

mysql-test/include/ndb_setup_slave.inc

@@ -1,27 +0,0 @@
-#
-# now setup replication to continue from last epoch
-# 1. get ndb_apply_status epoch from slave
-# 2. get corresponding _next_ binlog postition from master
-# 3. change master on slave
-
-# 1.
---connection slave
---replace_column 1 <the_epoch>
-SELECT @the_epoch:=MAX(epoch) FROM mysql.ndb_apply_status;
---let $the_epoch= `select @the_epoch`
-
-# 2.
---connection master
---replace_result $the_epoch <the_epoch>
---replace_column 1 <the_pos>
-eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-   FROM mysql.ndb_binlog_index WHERE epoch > $the_epoch ORDER BY epoch ASC LIMIT 1;
---let $the_pos= `SELECT @the_pos`
---let $the_file= `SELECT @the_file`
-
-# 3.
---connection slave
---replace_result $the_pos <the_pos>
-eval CHANGE MASTER TO
-  master_log_file = '$the_file',
-  master_log_pos = $the_pos ;

mysql-test/include/ndb_wait_connected.inc

@@ -1,26 +0,0 @@
-# Check that mysqld has reconnected to ndbd after
-# restart of ndbd
-#
---disable_query_log
---disable_result_log
-let $mysql_errno= 1;
-let $counter= 600;
-while ($mysql_errno)
-{
-  --error 0,157
-  CREATE TABLE ndb_wait_connected (a int primary key);
-  if ($mysql_errno)
-  {
-    if (!$counter)
-    {
-      die Failed waiting for mysqld to reconnect to ndbd;
-    }
-    dec $counter;
-    --sleep 0.1
-  }
-}
-DROP TABLE ndb_wait_connected;
---enable_query_log
---enable_result_log
-
-

mysql-test/include/not_ndb.inc

@@ -1,7 +0,0 @@
--- require r/not_ndb.require
-disable_query_log;
-# so that both DISABLED and NO is output as NO
--- replace_result DISABLED NO
-show variables like "have_ndbcluster";
-enable_query_log;
-

mysql-test/include/not_ndb_default.inc

@@ -1,4 +0,0 @@
---require r/not_ndb_default.require
-disable_query_log;
-select convert(@@storage_engine using latin1) NOT IN ("ndbcluster","NDBCLUSTER") as "TRUE";
-enable_query_log;