diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 17:44:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 17:44:22 +0100 |
| commit | 00a313ecf329098d4b31a42030b9b5c6f80a6031 (patch) | |
| tree | f4983a6629b04563c48fa7276686dfc2187efb5f /sql/mysqld.h | |
| parent | ef5adf520760536c7396bdfe884fc509ac065694 (diff) | |
| parent | 691f93d6d17603f11a0c90f64e94b7ce9d187db4 (diff) | |
| download | mariadb-git-00a313ecf329098d4b31a42030b9b5c6f80a6031.tar.gz | |
Merge branch 'bb-10.3-release' into bb-10.4-release
Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution"
was null-merged. 10.4 version of the fix is coming up separately
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index bd45ff7b798..f4d0d891a0f 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -615,8 +615,7 @@ extern mysql_mutex_t LOCK_error_log, LOCK_delayed_insert, LOCK_short_uuid_generator, LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone, LOCK_active_mi, LOCK_manager, LOCK_user_conn, - LOCK_prepared_stmt_count, LOCK_error_messages, LOCK_connection_count, - LOCK_slave_background; + LOCK_prepared_stmt_count, LOCK_error_messages, LOCK_connection_count ; extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_global_system_variables; extern mysql_rwlock_t LOCK_all_status_vars; extern mysql_mutex_t LOCK_start_thread; @@ -631,7 +630,6 @@ extern mysql_rwlock_t LOCK_ssl_refresh; extern mysql_prlock_t LOCK_system_variables_hash; extern mysql_cond_t COND_start_thread; extern mysql_cond_t COND_manager; -extern mysql_cond_t COND_slave_background; extern Atomic_counter<uint32_t> thread_count; extern char *opt_ssl_ca, *opt_ssl_capath, *opt_ssl_cert, *opt_ssl_cipher, |