database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed things missing in merge between 10.0-base and 10.0

Browse Source 
Updated --help text to declare --slave-parallel-threads as an alpha feature

mysql-test/r/mysqld--help.result:
  Updated --help text
sql/slave.cc:
  Added missing trans_retries++ that caused rpl_deadlock_innodb.test to fail.
  This is safe as this part is never run in parallel.
sql/sql_base.cc:
  Fixed temporary table handling (part of merge)
sql/sys_vars.cc:
  Updated --help text to declare --slave-parallel-threads as an alpha feature
This commit is contained in:
Michael Widenius
2013-11-03 22:26:44 +02:00
parent 57a267a8c0
commit de9d9792ab
4 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/mysqld--help.result
View File

@ -878,9 +878,10 @@ The following options may be given as the first argument:
relay log looking for opportunities for parallel
replication. Only used when --slave-parallel-threads > 0.
--slave-parallel-threads=#
If non-zero, number of threads to spawn to apply in
parallel events on the slave that were group-committed on
the master or were logged with GTID in different
Alpha feature, to only be used by developers doing
testing! If non-zero, number of threads to spawn to apply
in parallel events on the slave that were group-committed
on the master or were logged with GTID in different
replication domains.
--slave-skip-errors=name
Tells the slave thread to continue replication when a