[Commits] 555915f: Merge branch '5.5-galera' into 10.0-galera

Nirbhay Choubey nirbhay at mariadb.com
Wed Mar 11 19:15:29 EET 2015


revision-id: 555915faa9fc5ec0a7df09b51716be027120fa8c
parent(s): 100249be6aa00288081b2374db105a81cc525daf 7a6cad5221b19ed5d54eaca83c16655089734a0e
committer: Nirbhay Choubey
branch nick: 10.0-galera
timestamp: 2015-03-11 13:15:16 -0400
message:

Merge branch '5.5-galera' into 10.0-galera

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




More information about the commits mailing list