Incorporate currently planned MariaDB support EOL

Signed-off-by: Matt Lord <mattalord@gmail.com>
vitessio · Apr 11, 2022 · aceabf7 · aceabf7
1 parent 52ae94f
commit aceabf7
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 17 deletions.
diff --git a/content/en/docs/11.0/overview/supported-databases.md b/content/en/docs/11.0/overview/supported-databases.md
@@ -22,7 +22,7 @@ MySQL and Percona Server for MySQL 5.6 are no longer supported in Vitess 13.0 an
 
 Vitess supports the core features of MariaDB versions 10.0 to 10.3. Vitess [does not yet](https://github.com/vitessio/vitess/issues/5362) support later versions of MariaDB.
 
-{{< warning >}}MariaDB support is likely to end in the future. You can view and comment on [the relevant proposal here](https://github.com/vitessio/vitess/issues/9518).{{< /warning >}}
+{{< warning >}}MariaDB support has been EOL'd in Vitess 14.0.{{< /warning >}}
 
 ## See also
 

diff --git a/content/en/docs/12.0/overview/supported-databases.md b/content/en/docs/12.0/overview/supported-databases.md
@@ -22,7 +22,7 @@ MySQL and Percona Server for MySQL 5.6 are no longer supported in Vitess 13.0 an
 
 Vitess supports the core features of MariaDB versions 10.0 to 10.3. Vitess [does not yet](https://github.com/vitessio/vitess/issues/5362) support later versions of MariaDB.
 
-{{< warning >}}MariaDB support is likely to end in the future. You can view and comment on [the relevant proposal here](https://github.com/vitessio/vitess/issues/9518).{{< /warning >}}
+{{< warning >}}MariaDB support has been EOL'd in Vitess 14.0.{{< /warning >}}
 
 ## See also
 

diff --git a/content/en/docs/13.0/overview/supported-databases.md b/content/en/docs/13.0/overview/supported-databases.md
@@ -18,7 +18,7 @@ Vitess supports the core features of MySQL versions 5.7 to 8.0, with [some limit
 
 Vitess supports the core features of MariaDB versions 10.0 to 10.3. Vitess [does not yet](https://github.com/vitessio/vitess/issues/5362) support later versions of MariaDB.
 
-{{< warning >}}MariaDB support is likely to end in the the future. You can view and comment on [the relevant proposal here](https://github.com/vitessio/vitess/issues/9518).{{< /warning >}}
+{{< warning >}}MariaDB support has been EOL'd in Vitess 14.0.{{< /warning >}}
 
 ## See also
 

diff --git a/content/en/docs/14.0/contributing/build-on-centos.md b/content/en/docs/14.0/contributing/build-on-centos.md
@@ -37,7 +37,7 @@ export GOPATH=/home/<user>/go
 
 ### Packages from CentOS repos
 
-The MariaDB version included with CentOS 7 (5.5) is not supported by Vitess. First install the MySQL 5.7 repository from Oracle:
+First install the MySQL 5.7 repository from Oracle:
 
 ```
 sudo yum localinstall -y https://dev.mysql.com/get/mysql57-community-release-el7-9.noarch.rpm

diff --git a/content/en/docs/14.0/overview/supported-databases.md b/content/en/docs/14.0/overview/supported-databases.md
@@ -4,7 +4,7 @@ weight: 2
 featured: true
 ---
 
-Vitess deploys, scales and manages clusters of open-source SQL database instances. Currently, Vitess supports the [MySQL](https://www.mysql.com/), [Percona Server for MySQL](https://www.percona.com/software/mysql-database/percona-server), and to a limited extent [MariaDB](https://mariadb.org) databases.
+Vitess deploys, scales and manages clusters of open-source SQL database instances. Currently, Vitess supports the [MySQL](https://www.mysql.com/) and [Percona Server for MySQL](https://www.percona.com/software/mysql-database/percona-server) databases.
 
 The [VTGate](../../concepts/vtgate/) proxy server advertises its version as MySQL 5.7.
 
@@ -14,12 +14,6 @@ Vitess supports the core features of MySQL versions 5.7 to 8.0, with [some limit
 
 {{< info >}}For new Vitess installations, MySQL or Percona Server for MySQL version 8 are recommended.{{< /info >}}
 
-## MariaDB versions 10.0 to 10.3
-
-Vitess supports the core features of MariaDB versions 10.0 to 10.3. Vitess [does not yet](https://github.com/vitessio/vitess/issues/5362) support later versions of MariaDB.
-
-{{< warning >}}MariaDB support is likely to end in the the future. You can view and comment on [the relevant proposal here](https://github.com/vitessio/vitess/issues/9518).{{< /warning >}}
-
 ## See also
 
 + [MySQL Compatibility](../../reference/compatibility/mysql-compatibility/)
diff --git a/content/en/docs/14.0/overview/whatisvitess.md b/content/en/docs/14.0/overview/whatisvitess.md
@@ -4,7 +4,7 @@ weight: 1
 featured: true
 ---
 
-Vitess is a database solution for deploying, scaling and managing large clusters of open-source database instances. It currently supports MySQL, Percona and MariaDB. It's architected to run as effectively in a public or private cloud architecture as it does on dedicated hardware. It combines and extends many important SQL features with the scalability of a NoSQL database. Vitess can help you with the following problems:
+Vitess is a database solution for deploying, scaling and managing large clusters of open-source database instances. It currently supports MySQL and Percona Server for MySQL. It's architected to run as effectively in a public or private cloud architecture as it does on dedicated hardware. It combines and extends many important SQL features with the scalability of a NoSQL database. Vitess can help you with the following problems:
 
 1. Scaling a SQL database by allowing you to shard it, while keeping application changes to a minimum.
 2. Migrating from baremetal to a private or public cloud.

diff --git a/content/en/docs/14.0/reference/vreplication/materialize.md b/content/en/docs/14.0/reference/vreplication/materialize.md
@@ -18,7 +18,7 @@ can be copies, aggregations or views. The target tables are kept in sync in near
 You can specify multiple tables to materialize using the json_spec parameter.
 
 {{< warning >}}
-Be careful to avoid using the `INSTANT ADD COLUMN` feature in [MySQL 8.0+](https://mysqlserverteam.com/mysql-8-0-innodb-now-supports-instant-add-column/) and [MariaDB 10.3+](https://mariadb.com/kb/en/instant-add-column-for-innodb/) with materialization source tables as this can cause the vreplication based materialization workflow to break.
+Be careful to avoid using the `INSTANT ADD COLUMN` feature in [MySQL 8.0+](https://mysqlserverteam.com/mysql-8-0-innodb-now-supports-instant-add-column/) with materialization source tables as this can cause the vreplication based materialization workflow to break.
 {{< /warning >}}
 
 ### Parameters

diff --git a/content/en/docs/14.0/user-guides/configuration-basic/collations.md b/content/en/docs/14.0/user-guides/configuration-basic/collations.md
@@ -17,8 +17,8 @@ The following table lists all of the supported collations in the current release
 | Legend | |
 |----|----|
 | ✅ | Vitess has full support for this collation. |
-| ⚠️ | The underlying MySQL engine supports this collation, but Vitess does not. |
-| ❌ | Neither Vitess nor the underlying MySQL engine supports this collation. |
+| ⚠️ | The underlying MySQL (or compatible) database supports this collation, but Vitess does not. |
+| ❌ | Neither Vitess nor the underlying MySQL database supports this collation. |
 
 Using collations that are not supported by Vitess but implemented in the underlying MySQL instance can lead to unpredictable behavior.
 

diff --git a/.../docs/14.0/user-guides/operating-vitess/backup-and-restore/creating-a-backup.md b/.../docs/14.0/user-guides/operating-vitess/backup-and-restore/creating-a-backup.md
@@ -14,9 +14,8 @@ A compatible version of [xtrabackup](https://www.percona.com/doc/percona-xtrabac
 
 ### Supported Versions of Xtrabackup
 
-* [For MySQL 5.7 and MariaDB 10](https://www.percona.com/doc/percona-xtrabackup/2.4/index.html#installation)
+* [For MySQL 5.7](https://www.percona.com/doc/percona-xtrabackup/2.4/index.html#installation)
 * [MySQL 8.0](https://www.percona.com/doc/percona-xtrabackup/8.0/index.html#installation)
-* MariaDB 10.3 is not compatible with xtrabackup
 
 ### Basic VTTablet and Vtctld Configuration