diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-16 13:25:56 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-16 16:39:10 +1100 |
| commit | 069139a549a62f26d566c1aea2a49c13e9e8a654 (patch) | |
| tree | dae7c9ae7a4929ed7a897eda2c6c316fd2394e4e /sql/ha_partition.h | |
| parent | 9c6135e81f29b3e3286d6b864c0fdafc2fea16ce (diff) | |
| parent | 6a2d88c132221ea07dd322060089c85ff5e469b5 (diff) | |
| download | mariadb-git-069139a549a62f26d566c1aea2a49c13e9e8a654.tar.gz | |
Merge 10.3 to 10.4
extra2_read_len resolved by keeping the implementation
in sql/table.cc by exposed it for use by ha_partition.cc
Remove identical implementation in unireg.h
(ref: bfed2c7d57a7ca34936d6ef0688af7357592dc40)
Diffstat (limited to 'sql/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 8b2c42d94bc..f622c12d4e4 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -582,8 +582,9 @@ private: And one method to read it in. */ bool create_handler_file(const char *name); - bool setup_engine_array(MEM_ROOT *mem_root); + bool setup_engine_array(MEM_ROOT *mem_root, handlerton *first_engine); bool read_par_file(const char *name); + handlerton *get_def_part_engine(const char *name); bool get_from_handler_file(const char *name, MEM_ROOT *mem_root, bool is_clone); bool new_handlers_from_part_info(MEM_ROOT *mem_root); |