diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-22 11:54:19 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-22 11:54:19 -0500 |
| commit | e95c34481ca69c033ecc2695abd7dd5354ef1f3a (patch) | |
| tree | 0763768a32bed32799bc36dbff47b901ab1a22e2 | |
| parent | 0c8242b26e6c7c2d373ae11ad5a3f97d75e6299c (diff) | |
| parent | 03ee4bbda671f9d33dd2e990101840cdfde71e81 (diff) | |
| download | sqlalchemy-e95c34481ca69c033ecc2695abd7dd5354ef1f3a.tar.gz | |
Merge remote-tracking branch 'origin/pr/222'
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 988746403..2740397af 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -602,6 +602,8 @@ RESERVED_WORDS = set( 'get', 'io_after_gtids', 'io_before_gtids', 'master_bind', 'one_shot', 'partition', 'sql_after_gtids', 'sql_before_gtids', # 5.6 + 'generated', 'optimizer_costs', 'stored', 'virtual', # 5.7 + ]) AUTOCOMMIT_RE = re.compile( |