Merge branch 'bpo/2.7/#3083' into 2.7

Backporting #3083 into 2.7

Merge branch 'bpo/2.7/#3083' into 2.7
Backporting #3083 into 2.7
0b8f2aa2 · Michael Moravec · 2f647992 · 90f3886a · 0b8f2aa2
Unverified Commit 0b8f2aa2 authored Apr 06, 2018 by Michael Moravec
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

configuration.rst docs/en/reference/configuration.rst +3 -0

No files found.
--- a/docs/en/reference/configuration.rst
+++ b/docs/en/reference/configuration.rst
@@ -382,6 +382,9 @@ You can also pass this option if you want to disable automatic database platform
 detection for a driver that natively supports it and choose the platform version
 implementation explicitly.
+If you are running a MariaDB database, you should prefix the ``serverVersion`` 
+with ``mariadb-`` (ex: ``mariadb-10.2.12``).
 Custom Platform
 ~~~~~~~~~~~~~~~