From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 4 Nov 2008 13:18:13 +0000 (+0000)
Subject: - added 'EXPLAIN' to the list of 'returns rows', but this
X-Git-Tag: rel_0_5rc3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f1e5e213d65375e89a23ecb4d50566c1f34b7b0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- added 'EXPLAIN' to the list of 'returns rows', but this
issue will be addressed more fully by [ticket:1212].
---

diff --git a/CHANGES b/CHANGES
index b10dbc5c85..8fbdbb5da7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -95,6 +95,9 @@ CHANGES
 
     - No longer expects include_columns in table reflection to be
       lower case.
+
+    - added 'EXPLAIN' to the list of 'returns rows', but this 
+      issue will be addressed more fully by [ticket:1212].
       
 - misc
     - util.flatten_iterator() func doesn't interpret strings with
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index daa24e4695..b03ee5764c 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -221,7 +221,7 @@ AUTOCOMMIT_RE = re.compile(
     r'\s*(?:UPDATE|INSERT|CREATE|DELETE|DROP|ALTER|LOAD +DATA|REPLACE)',
     re.I | re.UNICODE)
 SELECT_RE = re.compile(
-    r'\s*(?:SELECT|SHOW|DESCRIBE|XA RECOVER|CALL)',
+    r'\s*(?:SELECT|SHOW|DESCRIBE|XA RECOVER|CALL|EXPLAIN)',
     re.I | re.UNICODE)
 SET_RE = re.compile(
     r'\s*SET\s+(?:(?:GLOBAL|SESSION)\s+)?\w',