database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge MDEV-6589 and MDEV-6403 into 10.1.

Browse Source 
Conflicts:
	sql/log.cc
	sql/rpl_rli.cc
	sql/sql_repl.cc
This commit is contained in:
Kristian Nielsen
2015-03-04 13:48:28 +01:00
parent f4f37533a0 78c74dbe30
commit 95d7208859
13 changed files with 666 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/rpl_parallel.h
View File

@ -339,5 +339,6 @@ extern struct rpl_parallel_thread_pool global_rpl_thread_pool;
extern int rpl_parallel_change_thread_count(rpl_parallel_thread_pool *pool,
uint32 new_count,
bool skip_check= false);
extern bool process_gtid_for_restart_pos(Relay_log_info *rli, rpl_gtid *gtid);
#endif /* RPL_PARALLEL_H */