summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-01-20 12:16:46 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-01-28 17:39:06 +0400
commitc88fd54d171fdba6aad3f7e16a4060cca03143d3 (patch)
tree31926f4728935dd22d58b4525b466583d2ed7fe8 /sql/mysqld.h
parent7ad742b265c290c0586ff4523b52a320ca05feea (diff)
downloadmariadb-git-c88fd54d171fdba6aad3f7e16a4060cca03143d3.tar.gz
Execute bootstrap in main thread
Bootstrap in a separate thread was introduced in 746f0b3b7 to workaround OS/2 small stack size. OS/2 support was discontinued in 2006 and modern operating systems have default stack size a few times larger than default thread_stack and it is tunable. Aim is to reduce usage of LOCK_thread_count and COND_thread_count. Part of MDEV-15135.
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 49663f27a66..2acfc7db5d3 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -128,7 +128,6 @@ extern bool opt_ignore_builtin_innodb;
extern my_bool opt_character_set_client_handshake;
extern my_bool debug_assert_on_not_freed_memory;
extern bool volatile abort_loop;
-extern bool volatile in_bootstrap;
extern uint connection_count;
extern my_bool opt_safe_user_create;
extern my_bool opt_safe_show_db, opt_local_infile, opt_myisam_use_mmap;
@@ -297,7 +296,6 @@ extern int mysqld_server_started, mysqld_server_initialized;
extern "C" MYSQL_PLUGIN_IMPORT int orig_argc;
extern "C" MYSQL_PLUGIN_IMPORT char **orig_argv;
extern pthread_attr_t connection_attrib;
-extern MYSQL_FILE *bootstrap_file;
extern my_bool old_mode;
extern LEX_STRING opt_init_connect, opt_init_slave;
extern int bootstrap_error;