diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-11-22 13:47:14 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-12-13 08:47:48 +1100 |
| commit | 382e85fe70cfffb6c7190c627647c19aed3912a5 (patch) | |
| tree | 2f643b9b6de3bd193c395dfb7538e9d7606b4067 | |
| parent | c1cc6e84963e4f904bab758de40fe28c7eee4f68 (diff) | |
| download | mariadb-git-382e85fe70cfffb6c7190c627647c19aed3912a5.tar.gz | |
MDEV-30065: mariadb-install-db allow for --enforce-storage-engine=InnoDB
Hide the errors related to missing innodb stats tables in bootstrap mode
on the assumption that because we are in bootstrap mode they are going
to be created.
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0stats.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index c91d8c0110d..6fe40c75555 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -5646,14 +5646,14 @@ dict_table_schema_check( /* no such table */ if (innobase_strcasecmp(req_schema->table_name, "mysql/innodb_table_stats") == 0) { - if (innodb_table_stats_not_found_reported == false) { + if (innodb_table_stats_not_found_reported == false && !opt_bootstrap) { innodb_table_stats_not_found = true; innodb_table_stats_not_found_reported = true; } else { should_print = false; } } else if (innobase_strcasecmp(req_schema->table_name, "mysql/innodb_index_stats") == 0 ) { - if (innodb_index_stats_not_found_reported == false) { + if (innodb_index_stats_not_found_reported == false && !opt_bootstrap) { innodb_index_stats_not_found = true; innodb_index_stats_not_found_reported = true; } else { diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc index 4adc06efd6d..5371fe50dbc 100644 --- a/storage/innobase/dict/dict0stats.cc +++ b/storage/innobase/dict/dict0stats.cc @@ -3293,7 +3293,8 @@ dict_stats_update( or is corrupted, calculate the transient stats */ if (innodb_table_stats_not_found == false && - table->stats_error_printed == false) { + table->stats_error_printed == false && + !opt_bootstrap) { ib::error() << "Fetch of persistent statistics" " requested for table " << table->name |