summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-07-03 13:46:33 +0200
committerunknown <knielsen@knielsen-hq.org>2013-07-03 13:46:33 +0200
commit31a5edb5c27d2ecae8d19345e1a373d22246143a (patch)
tree506d6dc5296b26619b3880dac6df5dc7748111e6 /sql/mysqld.h
parent1b3dc66e3117a09c95a00be2f649b975fdb25e2e (diff)
downloadmariadb-git-31a5edb5c27d2ecae8d19345e1a373d22246143a.tar.gz
MDEV-4506: Parallel replication. Intermediate commit.
Hook in the wait-for-prior-commit logic (not really tested yet). Clean up some resource maintenance around rpl_group_info (may still be some smaller issues there though). Add a ToDo list at the top of rpl_parallel.cc
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index ed6d05807b0..d3b17cfefe1 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -249,7 +249,7 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list,
key_LOCK_error_messages, key_LOCK_thread_count, key_PARTITION_LOCK_auto_inc;
extern PSI_mutex_key key_RELAYLOG_LOCK_index;
extern PSI_mutex_key key_LOCK_slave_state, key_LOCK_binlog_state,
- key_LOCK_rpl_thread, key_LOCK_rpl_thread_pool;
+ key_LOCK_rpl_thread, key_LOCK_rpl_thread_pool, key_LOCK_parallel_entry;
extern PSI_mutex_key key_LOCK_stats,
key_LOCK_global_user_client_stats, key_LOCK_global_table_stats,