diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-26 18:16:49 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-26 18:16:49 +0300 |
commit | 31c950cca8fa1623d41a8a7784e09fbcd6bc2c71 (patch) | |
tree | e0a2b134996c7fc07efe5f254943683f8a02c220 /storage/innobase/handler/ha_innodb.h | |
parent | 0e937f30f6cdadd2bc1607efa4a07f19c88e1b68 (diff) | |
parent | c6392d52ee2e918a65b05c275286ff4d450eef2c (diff) | |
download | mariadb-git-31c950cca8fa1623d41a8a7784e09fbcd6bc2c71.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/handler/ha_innodb.h')
-rw-r--r-- | storage/innobase/handler/ha_innodb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 9dccfa38016..1a47dab423f 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -745,6 +745,9 @@ public: ulint flags() const { return(m_flags); } + /** Update table flags. */ + void flags_set(ulint flags) { m_flags |= flags; } + /** Get table flags2. */ ulint flags2() const { return(m_flags2); } |