Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ Eing
ekh
emaillookup
endscript
enduml
ENHANCEDSTATUSCODES
enotify
entra
Expand Down Expand Up @@ -383,6 +382,7 @@ libkrb
libldap
liblib
liblz
libmariadb
libmysqlclient
libntlm
libotp
Expand Down Expand Up @@ -751,7 +751,6 @@ sqluser
SSHA
ssldir
stackbuf
startuml
STATEDIR
staticbuf
staticdb
Expand Down Expand Up @@ -865,7 +864,6 @@ urandom
Urg
urlauth
URLFETCH
usecase
usecs
userdata
userdb
Expand Down
2 changes: 1 addition & 1 deletion data/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3997,7 +3997,7 @@ consistency.`
values: setting_types.NAMED_LIST_FILTER,
seealso: [ 'mysql_host' ],
text: `
Creates a new MySQL connection. If more than one is specified, the connections
Creates a new MySQL/MariaDB connection. If more than one is specified, the connections
are automatically used for load balancing and for failover. The filter name
refers to the [[setting,mysql_host]] setting.`
},
Expand Down
4 changes: 2 additions & 2 deletions docs/core/config/auth/databases/sql.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dovecotlinks:
auth_sql: SQL authentication database
auth_mysql:
hash: mysql
text: MySQL authentication
text: MySQL/MariaDB authentication
auth_postgresql:
hash: postgresql
text: PostgreSQL authentication
Expand Down Expand Up @@ -166,7 +166,7 @@ CREATE TABLE users (
);
```

### MySQL
### MySQL/MariaDB

Add to your `dovecot.conf` file:

Expand Down
4 changes: 2 additions & 2 deletions docs/core/config/sql/mysql.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
layout: doc
title: MySQL
dovecotlinks:
sql_mysql: MySQL Configuration
sql_mysql: MySQL/MariaDB Configuration
---

# SQL Driver: MySQL
# SQL Driver: MySQL/MariaDB

Driver name `mysql`.

Expand Down
4 changes: 2 additions & 2 deletions docs/installation/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@ similar package)

##### `--with-mysql`

Build with MySQL support (requires `mysql-devel`, `libmysqlclient-dev`
or similar package)
Build with MySQL or MariaDB support (requires `mysql-devel`,
`libmysqlclient-dev`, `libmariadb-dev-compat` or similar package)

##### `--with-sqlite`

Expand Down