diff options
| author | Monty <monty@mariadb.org> | 2021-03-30 17:06:55 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2021-04-08 13:16:06 +0300 |
| commit | 5f3f569d75f6e9dc029d332435d50b8e25ddc285 (patch) | |
| tree | a8c3ae41d6fafea35a7480a0c1ec141732c08f3e /storage | |
| parent | d9b538a522fdf3513942d90ad54366c13b2699ec (diff) | |
| download | mariadb-git-5f3f569d75f6e9dc029d332435d50b8e25ddc285.tar.gz | |
MDEV-18465 Logging of DDL statements during backup
Many of the changes was needed to be able to collect and print engine
name and table version id's in the ddl log.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ha_maria.cc | 1 | ||||
| -rw-r--r-- | storage/rocksdb/rdb_datadic.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index a59b98a8cb0..9db5eea4c1f 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -2273,6 +2273,7 @@ int ha_maria::end_bulk_insert() BULK_INSERT_SINGLE_UNDO_AND_NO_REPAIR))) first_error= first_error ? first_error : error; bulk_insert_single_undo= BULK_INSERT_NONE; // Safety + log_not_redoable_operation("BULK_INSERT"); } can_enable_indexes= 0; DBUG_RETURN(first_error); diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc index f52d3cee048..6c3e99be55e 100644 --- a/storage/rocksdb/rdb_datadic.cc +++ b/storage/rocksdb/rdb_datadic.cc @@ -3793,7 +3793,8 @@ bool Rdb_validate_tbls::check_frm_file(const std::string &fullpath, */ char eng_type_buf[NAME_CHAR_LEN+1]; LEX_CSTRING eng_type_str = {eng_type_buf, 0}; - enum Table_type type = dd_frm_type(nullptr, fullfilename.c_ptr(), &eng_type_str); + enum Table_type type = dd_frm_type(nullptr, fullfilename.c_ptr(), + &eng_type_str, nullptr, nullptr); if (type == TABLE_TYPE_UNKNOWN) { // NO_LINT_DEBUG sql_print_warning("RocksDB: Failed to open/read .from file: %s", |