[1.10.x] 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.
Backport of f8bfa80680
from master
This commit is contained in:
parent
cb78011402
commit
a8b2445a78
1
AUTHORS
1
AUTHORS
|
@ -462,6 +462,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>
|
||||
|
|
|
@ -366,8 +366,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)
|
||||
|
|
Loading…
Reference in New Issue