summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-02-12 23:07:51 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-02-12 23:07:51 +0400
commit4d5f85a3ec59b4a417da39a229fbb58e79c32029 (patch)
treed727f074715caff22d9fc5f7c7838aa76a1a9497 /sql/mysqld.h
parentffa4677c098dd482a92f36f7658103822c39b2fe (diff)
downloadmariadb-git-4d5f85a3ec59b4a417da39a229fbb58e79c32029.tar.gz
Bootstrap cleanups
Remove unused key_thread_bootstrap. No more global bootstrap_error: it is return value of bootstrap() instead.
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 3d056fb95c7..e2e1b999beb 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -297,7 +297,6 @@ extern "C" MYSQL_PLUGIN_IMPORT char **orig_argv;
extern pthread_attr_t connection_attrib;
extern my_bool old_mode;
extern LEX_STRING opt_init_connect, opt_init_slave;
-extern int bootstrap_error;
extern char err_shared_dir[];
extern ulong connection_errors_select;
extern ulong connection_errors_accept;
@@ -394,7 +393,7 @@ extern PSI_cond_key key_COND_rpl_thread, key_COND_rpl_thread_queue,
extern PSI_cond_key key_COND_wait_gtid, key_COND_gtid_ignore_duplicates;
extern PSI_cond_key key_TABLE_SHARE_COND_rotation;
-extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
+extern PSI_thread_key key_thread_delayed_insert,
key_thread_handle_manager, key_thread_kill_server, key_thread_main,
key_thread_one_connection, key_thread_signal_hand,
key_thread_slave_background, key_rpl_parallel_thread;