From f8bfa806805a87d2cdd677089bd96fbf8400cb95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= <m@brothier.org>
Date: Thu, 7 Jul 2016 15:13:56 +0200
Subject: [PATCH] Fixed #26868 -- Changed MySQL version detection to use a
 query.

Workaround a bug with MariaDB and MySQL native client not stripping the
`5.5.5-` prefix.
---
 AUTHORS                          | 1 +
 django/db/backends/mysql/base.py | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a8bfe07f6b0..9ea3cd1b569 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -464,6 +464,7 @@ answer newbie questions, and generally made Django that much better:
     Marcin Wróbel
     Marc Remolt <m.remolt@webmasters.de>
     Marc Tamlyn <marc.tamlyn@gmail.com>
+    Marc-Aurèle Brothier <ma.brothier@gmail.com>
     Marian Andre <django@andre.sk>
     Marijn Vriens <marijn@metronomo.cl>
     Mario Gonzalez <gonzalemario@gmail.com>
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index 524e90d6eb7..94415139cc3 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -369,8 +369,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
 
     @cached_property
     def mysql_version(self):
-        with self.temporary_connection():
-            server_info = self.connection.get_server_info()
+        with self.temporary_connection() as cursor:
+            cursor.execute('SELECT VERSION()')
+            server_info = cursor.fetchone()[0]
         match = server_version_re.match(server_info)
         if not match:
             raise Exception('Unable to determine MySQL version from version string %r' % server_info)