27 files changed, 1 insertions, 377 deletions

diff --git a/debian/README.Maintainer b/debian/README.Maintainer
index b1e0a602781..9e44495ee3b 100644
--- a/debian/README.Maintainer
+++ b/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
 #
diff --git a/debian/mariadb-server-10.1.mysql.init b/debian/mariadb-server-10.1.mysql.init
index 7854007afc6..d1975bcbca7 100644
--- a/debian/mariadb-server-10.1.mysql.init
+++ b/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
diff --git a/debian/mariadb-server-10.1.preinst b/debian/mariadb-server-10.1.preinst
index 49651c41195..1df01b2dcee 100644
--- a/debian/mariadb-server-10.1.preinst
+++ b/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
diff --git a/debian/mariadb-server-10.1.templates b/debian/mariadb-server-10.1.templates
index fd83d2af293..f64dd02d7bd 100644
--- a/debian/mariadb-server-10.1.templates
+++ b/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/.
diff --git a/debian/mariadb-test-10.1.dirs b/debian/mariadb-test-10.1.dirs
index f45bf43f7e9..1a488d98195 100644
--- a/debian/mariadb-test-10.1.dirs
+++ b/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
diff --git a/debian/patches/00list b/debian/patches/00list
index 77c159a17ed..f4485b1b58e 100644
--- a/debian/patches/00list
+++ b/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
diff --git a/debian/patches/02_no_builtin_ndbcluster_plugin.dpatch b/debian/patches/02_no_builtin_ndbcluster_plugin.dpatch
deleted file mode 100644
index dc881ccca10..00000000000
--- a/debian/patches/02_no_builtin_ndbcluster_plugin.dpatch
+++ /dev/null
@@ -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
- };
- 
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 737522212b8..c9009069ee5 100644
--- a/debian/po/ar.po
+++ b/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:"
diff --git a/debian/po/ca.po b/debian/po/ca.po
index bbff00407cc..7c7d2210834 100644
--- a/debian/po/ca.po
+++ b/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 "
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 7f80d45e33b..f3ae24b1e8c 100644
--- a/debian/po/cs.po
+++ b/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:"
diff --git a/debian/po/da.po b/debian/po/da.po
index 8c592992182..d68b8575d72 100644
--- a/debian/po/da.po
+++ b/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:"
diff --git a/debian/po/de.po b/debian/po/de.po
index e1fbad09d67..6147b55903e 100644
--- a/debian/po/de.po
+++ b/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/."
diff --git a/debian/po/es.po b/debian/po/es.po
index 957b40118bb..e76c173a9f5 100644
--- a/debian/po/es.po
+++ b/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:"
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 0a4980488cb..8f1ae0c8ecd 100644
--- a/debian/po/eu.po
+++ b/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:"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 5055a354f9f..98d6740b7e2 100644
--- a/debian/po/fr.po
+++ b/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:"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index d991d98053a..122e4091c16 100644
--- a/debian/po/gl.po
+++ b/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:"
diff --git a/debian/po/it.po b/debian/po/it.po
index 40b24d575bf..459099cbc6a 100644
--- a/debian/po/it.po
+++ b/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/."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 6173c9b1ef8..c1087266eaf 100644
--- a/debian/po/ja.po
+++ b/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」"
-"で始まる行を削除してください。"
diff --git a/debian/po/nb.po b/debian/po/nb.po
index c3c2be245e7..992684fa3e1 100644
--- a/debian/po/nb.po
+++ b/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 ""
diff --git a/debian/po/nl.po b/debian/po/nl.po
index a8a920ffae8..82864ed8456 100644
--- a/debian/po/nl.po
+++ b/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 ""
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 1cb1b455160..0c35c038b70 100644
--- a/debian/po/pt.po
+++ b/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:"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index d8748ad9288..a0b4cdbfbfb 100644
--- a/debian/po/pt_BR.po
+++ b/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:"
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 0c37e3c0188..ceefecc8a1b 100644
--- a/debian/po/ro.po
+++ b/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!"
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 55d06fc86c9..5136933159b 100644
--- a/debian/po/ru.po
+++ b/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/."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 67d227618f4..0cd512a252b 100644
--- a/debian/po/sv.po
+++ b/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:"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 66af762ac0d..c164f1f4811 100644
--- a/debian/po/templates.pot
+++ b/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 ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 9e80ff89f00..814341a6bc2 100644
--- a/debian/po/tr.po
+++ b/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 "