Merge branch '5.5-galera' into 10.0-galera

Browse Source

Conflicts:
	mysql-test/suite/galera/r/rpl_row_annotate.result
	sql/rpl_rli.cc
	sql/slave.cc
	sql/wsrep_applier.cc
	sql/wsrep_thd.cc

...

This commit is contained in:

Nirbhay Choubey

2015-03-11 13:15:16 -04:00

parent 100249be6a 7a6cad5221

commit 555915faa9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available