lp:~maria-captains/maria/mariadb-5.2-rpl

Created by Kristian Nielsen and last modified
Get this branch:
bzr branch lp:~maria-captains/maria/mariadb-5.2-rpl
Members of Maria-captains can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Maria-captains
Project:
MariaDB
Status:
Merged

Recent revisions

2919. By Kristian Nielsen

Attempt to fix rpl.rpl_corruption failure seen in Buildbot on Windows.

There is a potential race when we stop the slave. It may take some time for
the master to detect that the slave connection is closed (eg. if scheduling
delays the TCP RSET packet or whatever). Since we inject only a single corrupt
binlog event, we may be unfortunate enough to inject it on the wrong
connection, to a slave io thread that's already stopped.

Fix by waiting for the old dump thread on the master to go away before
injecting the corrupt event.

2918. By Kristian Nielsen

merge some fixes for rpl_corruption.test from MySQL 5.6.

2917. By Kristian Nielsen

Fix race in testcase innodb_plugin.group_commit_no_optimize_thread

The problem was that connection con5, which is supposed to be the leader for
the third group, could if timing was bad end up as participant in the second
group, causing the test to fail.

Fixed by ensuring that group 2 is running before starting the transaction
for group 3.

2916. By Kristian Nielsen

MWL#180: Fix bug where setting @@global.binlog_checksum did not actually change the value.

2915. By Kristian Nielsen

MWL#180 Buildbot fixes:
 - Fix windows CMake build.
 - Merge some later test case fixes, to see if they solve the random rpl_checksum failure.

2914. By Kristian Nielsen

Backport MySQL WL#2540 into MariaDB.

Patch backported:

bzr diff
'-rrevid:<email address hidden>
..revid:<email address hidden>'
--old=lp:mysql-server --new=lp:mysql-server

2913. By Kristian Nielsen

Fix race in testcase innodb_plugin.group_commit

The problem was that connection con5, which is supposed to be the leader for
the third group, could if timing was bad end up as participant in the second
group, causing the test to fail.

Fixed by ensuring that group 2 is running before starting the transaction
for group 3.

2912. By Kristian Nielsen

Fix merge error.

2911. By Kristian Nielsen

MWL#116: After-review fixes.

Also implement the InnoDB changes for group commit into innodb_plugin.

2910. By Kristian Nielsen

Change lock release to assert in XtraDB commit_ordered(); we never want to
hold the latch across the 2-phase commit, and it is already released at
start of prepare (if not before).

Rename trx->active_trans to active_flag; since we changed the semantics of
the field, renaming should help prevent silent merge errors.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:maria/5.3
This branch contains Public information 
Everyone can see this information.