diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
| commit | 9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35 (patch) | |
| tree | 68f8e54f6c2484dc7791bee8c594d3d07c611d29 /sql/handler.h | |
| parent | 56990b18d914b8150c9f777d134724d2b3390360 (diff) | |
| parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
| download | mariadb-git-9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 0f72a394333..e3831eacd7a 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2514,6 +2514,9 @@ public: /** true for online operation (LOCK=NONE) */ bool online; + /** which ALGORITHM and LOCK are supported by the storage engine */ + enum_alter_inplace_result inplace_supported; + /** Can be set by handler to describe why a given operation cannot be done in-place (HA_ALTER_INPLACE_NOT_SUPPORTED) or why it cannot be done @@ -5176,7 +5179,7 @@ int ha_change_key_cache(KEY_CACHE *old_key_cache, KEY_CACHE *new_key_cache); /* transactions: interface to handlerton functions */ int ha_start_consistent_snapshot(THD *thd); int ha_commit_or_rollback_by_xid(XID *xid, bool commit); -int ha_commit_one_phase(THD *thd, bool all); +int ha_commit_one_phase(THD *thd, bool all, bool rw_trans); int ha_commit_trans(THD *thd, bool all); int ha_rollback_trans(THD *thd, bool all); int ha_prepare(THD *thd); |