From 3771019de9681260a25532498fca710f8c6c335c Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 28 Jul 2016 18:03:42 -0400
Subject: [PATCH] [1.9.x] Fixed #26657 -- Made GeomValue omit SRID for MySQL.

This fixes some test failures on MySQL 5.7+.

Backport of 9031a4c13bdb1ee4d0f1253fcfcad73d26c25740 from master
---
 django/contrib/gis/db/models/functions.py | 2 +-
 docs/releases/1.9.9.txt                   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/django/contrib/gis/db/models/functions.py b/django/contrib/gis/db/models/functions.py
index 7fd8cf1129..8ae4f6c260 100644
--- a/django/contrib/gis/db/models/functions.py
+++ b/django/contrib/gis/db/models/functions.py
@@ -79,7 +79,7 @@ class GeomValue(Value):
         return super(GeomValue, self).as_sql(compiler, connection)
 
     def as_mysql(self, compiler, connection):
-        return 'GeomFromText(%%s, %s)' % self.srid, [connection.ops.Adapter(self.value)]
+        return 'GeomFromText(%s)', [connection.ops.Adapter(self.value)]
 
     def as_sqlite(self, compiler, connection):
         return 'GeomFromText(%%s, %s)' % self.srid, [connection.ops.Adapter(self.value)]
diff --git a/docs/releases/1.9.9.txt b/docs/releases/1.9.9.txt
index 8e90f6c8dd..a777b17021 100644
--- a/docs/releases/1.9.9.txt
+++ b/docs/releases/1.9.9.txt
@@ -11,3 +11,5 @@ Bugfixes
 
 * Fixed invalid HTML in template postmortem on the debug page
   (:ticket:`26938`).
+
+* Fixed some GIS database function crashes on MySQL 5.7 (:ticket:`26657`).