Merge wsrep patches for MariaDB Galera Cluster 5.5.28.a

[Seppo Jaakola]

merge lp:codership-mysql/5.5 into mariadb project's lp:~maria-captains/maria/maria-5.5-galera branch up to revision #3805

[Seppo Jaakola (seppo-jaakola)]

merged with patch: bzr diff lp:codership-mysql/5.5 -r3795..3809 in revision: http://bazaar.launchpad.net/~maria-captains/maria/maria-5.5-galera/revision/3355

[Seppo Jaakola (seppo-jaakola)]

Merged MariaDB changes up to revision: http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/3562

bzr merge lp:maria/5.5

Text conflict in sql/mdl.cc
Text conflict in sql/mysqld.h
Text conflict in support-files/mysql.spec.sh
3 conflicts encountered.

[Seppo Jaakola (seppo-jaakola)]

MariaDB 5.5.28 merge pushed in revision: http://bazaar.launchpad.net/~maria-captains/maria/maria-5.5-galera/revision/3356

[Seppo Jaakola (seppo-jaakola)]

Merged revisions 3810-3827 in revision: http://bazaar.launchpad.net/~maria-captains/maria/maria-5.5-galera/revision/3357

seppo@pitbull:~/work/wsrep/maria-wsrep-5.5$ patch -p0 < ../mst/wsrep-5.5-slave_group/diff-3810-3823.diff
patching file mysys/default.c
patching file scripts/mysqld_safe.sh
Hunk #1 succeeded at 63 (offset 3 lines).
Hunk #2 succeeded at 125 (offset 3 lines).
Hunk #3 succeeded at 164 (offset 11 lines).
Hunk #4 succeeded at 194 (offset 11 lines).
Hunk #5 succeeded at 279 (offset 16 lines).
Hunk #6 succeeded at 832 (offset 20 lines).
Hunk #7 succeeded at 914 (offset 20 lines).
patching file sql/mdl.cc
Hunk #1 succeeded at 3015 (offset 1 line).
patching file sql/mdl.h
Hunk #1 succeeded at 475 (offset 1 line).
patching file sql/mysqld.cc
Hunk #1 FAILED at 3260.
Hunk #2 succeeded at 4390 (offset 428 lines).
Hunk #3 succeeded at 5630 (offset 386 lines).
Hunk #4 FAILED at 7877.
2 out of 4 hunks FAILED -- saving rejects to file sql/mysqld.cc.rej
patching file sql/slave.cc
Hunk #1 succeeded at 2601 (offset 212 lines).
Hunk #2 succeeded at 3568 (offset 246 lines).
patching file sql/sql_parse.cc
Hunk #1 succeeded at 1059 (offset 21 lines).
Hunk #2 succeeded at 4887 (offset 10 lines).
Hunk #3 succeeded at 4925 (offset 10 lines).
Hunk #4 FAILED at 6043.
Hunk #5 succeeded at 6170 (offset 89 lines).
Hunk #6 FAILED at 8104.
Hunk #7 succeeded at 8435 (offset 219 lines).
2 out of 7 hunks FAILED -- saving rejects to file sql/sql_parse.cc.rej
patching file sql/sys_vars.cc
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
5 out of 5 hunks ignored -- saving rejects to file sql/sys_vars.cc.rej
patching file sql/wsrep_mysqld.cc
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
12 out of 12 hunks ignored -- saving rejects to file sql/wsrep_mysqld.cc.rej
patching file sql/wsrep_mysqld.h
patching file sql/wsrep_sst.cc
patching file sql/wsrep_utils.cc
patching file sql/wsrep_var.cc
Hunk #1 FAILED at 24.
Hunk #2 FAILED at 152.
Hunk #3 succeeded at 231 with fuzz 2 (offset 6 lines).
Hunk #4 FAILED at 252.
Hunk #5 FAILED at 329.
4 out of 5 hunks FAILED -- saving rejects to file sql/wsrep_var.cc.rej

Revisions 3823-3827 merged later with no conflicts