diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-11-01 17:08:39 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-11-01 17:08:39 +0100 |
| commit | 1f9259dfea44fb2605b919d6b3b7ea9f151ed5ed (patch) | |
| tree | bf1c495717e10242176bb23962c806ea3ba73036 /storage | |
| parent | ea5d7a5cce62c876c9ff42f23815e5ebaf703df3 (diff) | |
| download | mariadb-git-1f9259dfea44fb2605b919d6b3b7ea9f151ed5ed.tar.gz | |
- Fix MDEV-6988 and MDEV-6994
modified:
storage/connect/ha_connect.cc
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/ha_connect.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index d482bece7a9..60d02cacf9e 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -3835,6 +3835,8 @@ MODE ha_connect::CheckMode(PGLOBAL g, THD *thd, case SQLCOM_OPTIMIZE: newmode= MODE_READ; break; + case SQLCOM_FLUSH: + locked= 0; case SQLCOM_DROP_TABLE: case SQLCOM_RENAME_TABLE: newmode= MODE_ANY; @@ -4014,6 +4016,8 @@ int ha_connect::external_lock(THD *thd, int lock_type) // This is unlocking, do it by closing the table if (xp->CheckQueryID() && sqlcom != SQLCOM_UNLOCK_TABLES && sqlcom != SQLCOM_LOCK_TABLES + && sqlcom != SQLCOM_FLUSH + && sqlcom != SQLCOM_BEGIN && sqlcom != SQLCOM_DROP_TABLE) { sprintf(g->Message, "external_lock: unexpected command %d", sqlcom); push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 0, g->Message); |