diff options
| author | unknown <knielsen@knielsen-hq.org> | 2014-02-26 16:38:42 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2014-02-26 16:38:42 +0100 |
| commit | 20959fa09c6d1c35793d8a577b52669f01615557 (patch) | |
| tree | 1fd24ed70ccda0a6ee470577ea74cf13d98c16d8 /sql/mysqld.h | |
| parent | 9d918f41d3910ed79bb71fd5405206b3a34c2a4b (diff) | |
| parent | e90f68c0ba1802d58b06bc7178513f77b27b662b (diff) | |
| download | mariadb-git-20959fa09c6d1c35793d8a577b52669f01615557.tar.gz | |
Merge MDEV-5657 (parallel replication) to 10.0
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 5e5eb16d7c3..ee8f7b82fb3 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -180,6 +180,7 @@ extern ulong opt_binlog_rows_event_max_size; extern ulong rpl_recovery_rank, thread_cache_size; extern ulong stored_program_cache_size; extern ulong opt_slave_parallel_threads; +extern ulong opt_slave_domain_parallel_threads; extern ulong opt_slave_parallel_max_queued; extern ulong opt_binlog_commit_wait_count; extern ulong opt_binlog_commit_wait_usec; @@ -295,8 +296,9 @@ extern PSI_cond_key key_RELAYLOG_update_cond, key_COND_wakeup_ready, key_COND_wait_commit; extern PSI_cond_key key_RELAYLOG_COND_queue_busy; extern PSI_cond_key key_TC_LOG_MMAP_COND_queue_busy; -extern PSI_cond_key key_COND_rpl_thread, key_COND_rpl_thread_pool, - key_COND_parallel_entry; +extern PSI_cond_key key_COND_rpl_thread, key_COND_rpl_thread_queue, + key_COND_rpl_thread_pool, + key_COND_parallel_entry, key_COND_group_commit_orderer; extern PSI_cond_key key_COND_wait_gtid; extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert, |