diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 09:05:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 09:05:15 +0300 |
| commit | 0632b8034b08c88176dc7db12ba53df04edd9300 (patch) | |
| tree | 5047cc21a5cab2318bd8421f85f56b3e201ddd4a /sql/handler.h | |
| parent | 503fd2115bdc79f0b005917e058855411fdeb691 (diff) | |
| parent | 1fbdcada73c1861b85080eede95140296d6a3c20 (diff) | |
| download | mariadb-git-0632b8034b08c88176dc7db12ba53df04edd9300.tar.gz | |
Merge 10.3 into 10.4
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 0c9d60b7c90..756481f06bb 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2453,11 +2453,14 @@ public: */ const char *unsupported_reason; + /** true when InnoDB should abort the alter when table is not empty */ + bool error_if_not_empty; + Alter_inplace_info(HA_CREATE_INFO *create_info_arg, Alter_info *alter_info_arg, KEY *key_info_arg, uint key_count_arg, partition_info *modified_part_info_arg, - bool ignore_arg); + bool ignore_arg, bool error_non_empty); ~Alter_inplace_info() { |