summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--lib/sqlalchemy/databases/mysql.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index b10dbc5c8..8fbdbb5da 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 daa24e469..b03ee5764 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',