diff options
Diffstat (limited to 'storage/innobase/include/srv0start.h')
| -rw-r--r-- | storage/innobase/include/srv0start.h | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h index 0dd98e5b19b..8de9e3457fc 100644 --- a/storage/innobase/include/srv0start.h +++ b/storage/innobase/include/srv0start.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -33,22 +34,6 @@ Created 10/10/1995 Heikki Tuuri // Forward declaration struct dict_table_t; -#ifdef DBUG_OFF -# define RECOVERY_CRASH(x) do {} while(0) -#else -# define RECOVERY_CRASH(x) do { \ - if (srv_force_recovery_crash == x) { \ - fprintf(stderr, "innodb_force_recovery_crash=%lu\n", \ - srv_force_recovery_crash); \ - fflush(stderr); \ - _exit(3); \ - } \ -} while (0) -#endif /* DBUG_OFF */ - -/** Log 'spaces' have id's >= this */ -#define SRV_LOG_SPACE_FIRST_ID 0xFFFFFFF0UL - /** If buffer pool is less than the size, only one buffer pool instance is used. */ #define BUF_POOL_SIZE_THRESHOLD (1024 * 1024 * 1024) @@ -74,7 +59,7 @@ char* srv_add_path_separator_if_needed( /*=============================*/ char* str); /*!< in: null-terminated character string */ -#ifndef UNIV_HOTBACKUP + /****************************************************************//** Starts Innobase and creates a new database if database files are not found and the user wants. @@ -82,11 +67,14 @@ are not found and the user wants. dberr_t innobase_start_or_create_for_mysql(void); /*====================================*/ +/** Shut down InnoDB. */ +void +innodb_shutdown(); + /****************************************************************//** -Shuts down the Innobase database. -@return DB_SUCCESS or error code */ -dberr_t -innobase_shutdown_for_mysql(void); +Shuts down background threads that can generate undo pages. */ +void +srv_shutdown_bg_undo_sources(void); /******************************************************************** Signal all per-table background threads to shutdown, and wait for them to do @@ -109,11 +97,6 @@ srv_path_copy( const char* table_name) /*!< in: source table name */ MY_ATTRIBUTE((nonnull, warn_unused_result)); -/** -Shutdown all background threads created by InnoDB. */ -void -srv_shutdown_all_bg_threads(); - /** Get the meta-data filename from the table name for a single-table tablespace. @param[in] table table object @@ -154,7 +137,6 @@ extern bool srv_startup_is_before_trx_rollback_phase; /** TRUE if a raw partition is in use */ extern ibool srv_start_raw_disk_in_use; - /** Shutdown state */ enum srv_shutdown_t { SRV_SHUTDOWN_NONE = 0, /*!< Database running normally */ @@ -174,6 +156,4 @@ enum srv_shutdown_t { /** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to SRV_SHUTDOWN_CLEANUP and then to SRV_SHUTDOWN_LAST_PHASE, and so on */ extern enum srv_shutdown_t srv_shutdown_state; -#endif /* !UNIV_HOTBACKUP */ - #endif |