From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 1 Aug 2013 01:05:33 +0000 (-0400)
Subject: Updates to MySQL reserved words for versions 5.5, 5.6, courtesy
X-Git-Tag: rel_0_8_3~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aa5631107287e5b34cf2e50d2672fbc8063a1b4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Updates to MySQL reserved words for versions 5.5, 5.6, courtesy
Hanno Schlichting.  Also in 0.8.3, 0.7.11.
[ticket:2791]

Conflicts:
	doc/build/changelog/changelog_09.rst
---

diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
index 697274558b..3504a5134d 100644
--- a/doc/build/changelog/changelog_07.rst
+++ b/doc/build/changelog/changelog_07.rst
@@ -6,6 +6,13 @@
 .. changelog::
     :version: 0.7.11
 
+    .. change::
+        :tags: mysql, bug
+        :tickets: 2791
+
+        Updates to MySQL reserved words for versions 5.5, 5.6, courtesy
+        Hanno Schlichting.
+
     .. change::
         :tags: sql, bug, cte
         :tickets: 2783
diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index b728c31cb4..560cc18943 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -6,6 +6,13 @@
 .. changelog::
     :version: 0.8.3
 
+    .. change::
+        :tags: mysql, bug
+        :tickets: 2791
+
+        Updates to MySQL reserved words for versions 5.5, 5.6, courtesy
+        Hanno Schlichting.  Also in 0.7.11.
+
     .. change::
         :tags: sql, bug, cte
         :tickets: 2783
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index f295db40af..b6af008f8b 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -318,10 +318,20 @@ RESERVED_WORDS = set(
      'union', 'unique', 'unlock', 'unsigned', 'update', 'usage', 'use',
      'using', 'utc_date', 'utc_time', 'utc_timestamp', 'values', 'varbinary',
      'varchar', 'varcharacter', 'varying', 'when', 'where', 'while', 'with',
+
      'write', 'x509', 'xor', 'year_month', 'zerofill',  # 5.0
+
      'columns', 'fields', 'privileges', 'soname', 'tables',  # 4.1
+
      'accessible', 'linear', 'master_ssl_verify_server_cert', 'range',
      'read_only', 'read_write',  # 5.1
+
+     'general', 'ignore_server_ids', 'master_heartbeat_period', 'maxvalue',
+     'resignal', 'signal', 'slow', # 5.5
+
+      'get', 'io_after_gtids', 'io_before_gtids', 'master_bind', 'one_shot',
+        'partition', 'sql_after_gtids', 'sql_before_gtids',  # 5.6
+
      ])
 
 AUTOCOMMIT_RE = re.compile(