From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 28 Sep 2017 23:31:13 +0000 (-0400)
Subject: Repair incorrectly merged mariadb logic
X-Git-Tag: rel_1_1_15~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c03607829910d386a089e3c37125669b838b0763;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Repair incorrectly merged mariadb logic

The changeset in c88d4d0 takes advantage of a
mariadb function that got randomly committed as part
of the SQL server fixup in 2efd89d02941ab4267d6e2842963, not
part of rel_1_1.    The change here was not reviewed or tested
in gerrit and breaks the main branch.

Change-Id: I41746f890e6e82acfb12e78f174d00d7ba7d19d4
Fixes: #4097
---

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 2f7353ee5b..5e76960dec 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1740,6 +1740,12 @@ class MySQLDialect(default.DefaultDialect):
     def _is_mariadb(self):
         return 'MariaDB' in self.server_version_info
 
+    def _mariadb_normalized_version_info(self):
+        if len(self.server_version_info) > 5:
+            return self.server_version_info[3:]
+        else:
+            return self.server_version_info
+
     @property
     def _supports_cast(self):
         return self.server_version_info is None or \