diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 309b93c..56c0116 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -15592,14 +15592,6 @@ innodb_buffer_pool_size_update( { long long in_val = *static_cast(save); - if (!srv_was_started) { - push_warning_printf(thd, Sql_condition::SL_WARNING, - ER_WRONG_ARGUMENTS, - "Cannot update innodb_buffer_pool_size," - " because InnoDB is not started."); - return; - } - #ifdef UNIV_DEBUG if (buf_disable_resize_buffer_pool_debug == TRUE) { push_warning_printf(thd, Sql_condition::SL_WARNING, diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index 7f9c6b6..4654f95 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -147,19 +147,6 @@ const ulint MAX_BUF_INFO_CACHED = 10000; DBUG_RETURN(1); \ } -#define RETURN_IF_INNODB_NOT_STARTED(plugin_name) \ -do { \ - if (!srv_was_started) { \ - push_warning_printf(thd, Sql_condition::SL_WARNING, \ - ER_CANT_FIND_SYSTEM_REC, \ - "InnoDB: SELECTing from " \ - "INFORMATION_SCHEMA.%s but " \ - "the InnoDB storage engine " \ - "is not installed", plugin_name); \ - DBUG_RETURN(0); \ - } \ -} while (0) - #if !defined __STRICT_ANSI__ && defined __GNUC__ && !defined __clang__ #define STRUCT_FLD(name, value) name: value #else @@ -1296,8 +1283,6 @@ trx_i_s_common_fill_table( table_name = tables->schema_table_name; /* or table_name = tables->schema_table->table_name; */ - RETURN_IF_INNODB_NOT_STARTED(table_name); - /* update the cache */ trx_i_s_cache_start_write(cache); trx_i_s_possibly_fetch_data_into_cache(cache); @@ -1443,8 +1428,6 @@ i_s_cmp_fill_low( DBUG_RETURN(0); } - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); - for (uint i = 0; i < PAGE_ZIP_SSIZE_MAX; i++) { page_zip_stat_t* zip_stat = &page_zip_stat[i]; @@ -1757,8 +1740,6 @@ i_s_cmp_per_index_fill_low( DBUG_RETURN(0); } - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); - /* Create a snapshot of the stats so we do not bump into lock order violations with dict_sys->mutex below. */ mutex_enter(&page_zip_stat_per_index_mutex); @@ -2088,8 +2069,6 @@ i_s_cmpmem_fill_low( DBUG_RETURN(0); } - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); - for (ulint i = 0; i < srv_buf_pool_instances; i++) { buf_pool_t* buf_pool; @@ -4873,7 +4852,6 @@ i_s_innodb_buffer_stats_fill_table( buf_pool_info_t* pool_info; DBUG_ENTER("i_s_innodb_buffer_fill_general"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* Only allow the PROCESS privilege holder to access the stats */ if (check_global_access(thd, PROCESS_ACL)) { @@ -5599,8 +5577,6 @@ i_s_innodb_buffer_page_fill_table( DBUG_ENTER("i_s_innodb_buffer_page_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); - /* deny access to user without PROCESS privilege */ if (check_global_access(thd, PROCESS_ACL)) { DBUG_RETURN(0); @@ -6151,8 +6127,6 @@ i_s_innodb_buf_page_lru_fill_table( DBUG_ENTER("i_s_innodb_buf_page_lru_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); - /* deny access to any users that do not hold PROCESS_ACL */ if (check_global_access(thd, PROCESS_ACL)) { DBUG_RETURN(0); @@ -6442,7 +6416,6 @@ i_s_sys_tables_fill_table( mtr_t mtr; DBUG_ENTER("i_s_sys_tables_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { @@ -6744,7 +6717,6 @@ i_s_sys_tables_fill_table_stats( mtr_t mtr; DBUG_ENTER("i_s_sys_tables_fill_table_stats"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { @@ -7009,7 +6981,6 @@ i_s_sys_indexes_fill_table( mtr_t mtr; DBUG_ENTER("i_s_sys_indexes_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { @@ -7251,7 +7222,6 @@ i_s_sys_columns_fill_table( mtr_t mtr; DBUG_ENTER("i_s_sys_columns_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { @@ -7459,7 +7429,6 @@ i_s_sys_fields_fill_table( mtr_t mtr; DBUG_ENTER("i_s_sys_fields_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { @@ -7695,7 +7664,6 @@ i_s_sys_foreign_fill_table( mtr_t mtr; DBUG_ENTER("i_s_sys_foreign_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { @@ -7914,7 +7882,6 @@ i_s_sys_foreign_cols_fill_table( mtr_t mtr; DBUG_ENTER("i_s_sys_foreign_cols_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { @@ -8215,7 +8182,6 @@ i_s_sys_tablespaces_fill_table( mtr_t mtr; DBUG_ENTER("i_s_sys_tablespaces_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { @@ -8410,7 +8376,6 @@ i_s_sys_datafiles_fill_table( mtr_t mtr; DBUG_ENTER("i_s_sys_datafiles_fill_table"); - RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h index 67cc9f4..11a8438 100644 --- a/storage/innobase/include/srv0start.h +++ b/storage/innobase/include/srv0start.h @@ -129,8 +129,6 @@ extern lsn_t srv_start_lsn; extern bool srv_is_being_started; /** TRUE if SYS_TABLESPACES is available for lookups */ extern bool srv_sys_tablespaces_open; -/** TRUE if the server was successfully started */ -extern ibool srv_was_started; /** TRUE if the server is being started, before rolling back any incomplete transactions */ extern bool srv_startup_is_before_trx_rollback_phase; diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 775f28c..d18e5f5 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -124,7 +124,7 @@ bool srv_is_being_started = false; /** TRUE if SYS_TABLESPACES is available for lookups */ bool srv_sys_tablespaces_open = false; /** TRUE if the server was successfully started */ -ibool srv_was_started = FALSE; +static ibool srv_was_started = FALSE; /** TRUE if innobase_start_or_create_for_mysql() has been called */ static ibool srv_start_has_been_called = FALSE;