summaryrefslogtreecommitdiff
path: root/storage/innobase/include/dict0types.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-07 11:49:50 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-07 11:49:50 +0300
commitcc492bfd4ff2d15cc5803a7d80f1559ceeb003c1 (patch)
treee5d3abbe5551d4f05a59cfcc0d629f8d4f50e98f /storage/innobase/include/dict0types.h
parentd5a2bc6a0f24f2a9ec73a0d18bb7e6fba3496bed (diff)
parent867617a97684cdf2c8df326d9a986c2cae779796 (diff)
downloadmariadb-git-cc492bfd4ff2d15cc5803a7d80f1559ceeb003c1.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/dict0types.h')
-rw-r--r--storage/innobase/include/dict0types.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h
index e3b536b83ee..80b918b2df0 100644
--- a/storage/innobase/include/dict0types.h
+++ b/storage/innobase/include/dict0types.h
@@ -78,7 +78,10 @@ enum dict_err_ignore_t {
Silently load a missing
tablespace, and do not load
incomplete index definitions. */
- DICT_ERR_IGNORE_ALL = 0xFFFF /*!< ignore all errors */
+ /** ignore all errors above */
+ DICT_ERR_IGNORE_ALL = 15,
+ /** prepare to drop the table; do not attempt to load tablespace */
+ DICT_ERR_IGNORE_DROP = 31
};
/** Quiescing states for flushing tables to disk. */