- 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 b10dbc5c85979949207d7dd759a59ab83d48f13b..8fbdbb5da744f4b26edcedc4bae0918374d6fcfe 100644 (file)
--- 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 daa24e4695b97016d11a9b2873ec62494a3f82f9..b03ee5764c93635e33c7ad0b3b7e825a93bad5ba 100644 (file)
--- 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',