Merge branch '5.5-galera' into bb-10.0-galera-merge

Conflicts:
	BUILD/compile-pentium-debug-wsrep
	BUILD/compile-pentium-wsrep
	BUILD/compile-pentium64-wsrep
	CMakeLists.txt
	client/mysqlcheck.c
	cmake/cpack_rpm.cmake
	cmake/install_macros.cmake
	cmake/os/FreeBSD.cmake
	cmake/plugin.cmake
	cmake/wsrep.cmake
	debian/dist/Debian/control
	debian/dist/Debian/mariadb-galera-server-10.0.README.Debian
	debian/dist/Debian/mariadb-galera-server-10.0.postrm
	debian/dist/Debian/mariadb-galera-server-5.5.README.Debian
	debian/dist/Debian/mariadb-galera-server-5.5.dirs
	debian/dist/Debian/mariadb-galera-server-5.5.files.in
	debian/dist/Debian/mariadb-galera-server-5.5.postinst
	debian/dist/Debian/mariadb-galera-server-5.5.postrm
	debian/dist/Debian/mariadb-server-5.5.README.Debian
	debian/dist/Debian/mariadb-server-5.5.postrm
	debian/dist/Debian/rules
	debian/dist/Ubuntu/control
	debian/dist/Ubuntu/mariadb-galera-server-10.0.README.Debian
	debian/dist/Ubuntu/mariadb-galera-server-10.0.postrm
	debian/dist/Ubuntu/mariadb-galera-server-5.5.README.Debian
	debian/dist/Ubuntu/mariadb-galera-server-5.5.dirs
	debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
	debian/dist/Ubuntu/mariadb-galera-server-5.5.postinst
	debian/dist/Ubuntu/mariadb-galera-server-5.5.postrm
	debian/dist/Ubuntu/mariadb-galera-server-5.5.py
	debian/dist/Ubuntu/mariadb-server-5.5.README.Debian
	debian/dist/Ubuntu/mariadb-server-5.5.postrm
	debian/dist/Ubuntu/rules
	debian/mariadb-galera-server-10.0.NEWS
	debian/mariadb-galera-server-10.0.config
	debian/mariadb-galera-server-10.0.logcheck.ignore.paranoid
	debian/mariadb-galera-server-10.0.logcheck.ignore.server
	debian/mariadb-galera-server-10.0.logcheck.ignore.workstation
	debian/mariadb-galera-server-10.0.mysql-server.logrotate
	debian/mariadb-galera-server-10.0.prerm
	debian/mariadb-galera-server-5.5.NEWS
	debian/mariadb-galera-server-5.5.config
	debian/mariadb-galera-server-5.5.logcheck.ignore.paranoid
	debian/mariadb-galera-server-5.5.logcheck.ignore.server
	debian/mariadb-galera-server-5.5.logcheck.ignore.workstation
	debian/mariadb-galera-server-5.5.mysql-server.logrotate
	debian/mariadb-galera-server-5.5.mysql.init
	debian/mariadb-galera-server-5.5.preinst
	debian/mariadb-galera-server-5.5.prerm
	debian/mariadb-galera-server-5.5.templates
	debian/mariadb-galera-test-10.0.links
	debian/mariadb-galera-test-5.5.dirs
	debian/mariadb-galera-test-5.5.files
	debian/mariadb-galera-test-5.5.links
	debian/mariadb-server-5.5.NEWS
	debian/mariadb-server-5.5.config
	debian/mariadb-server-5.5.logcheck.ignore.paranoid
	debian/mariadb-server-5.5.logcheck.ignore.server
	debian/mariadb-server-5.5.logcheck.ignore.workstation
	debian/mariadb-server-5.5.mysql-server.logrotate
	debian/mariadb-server-5.5.prerm
	debian/mariadb-test-5.5.links
	debian/po/POTFILES.in
	debian/po/ar.po
	debian/po/ca.po
	debian/po/cs.po
	debian/po/da.po
	debian/po/de.po
	debian/po/es.po
	debian/po/eu.po
	debian/po/fr.po
	debian/po/gl.po
	debian/po/it.po
	debian/po/ja.po
	debian/po/nb.po
	debian/po/nl.po
	debian/po/pt.po
	debian/po/pt_BR.po
	debian/po/ro.po
	debian/po/ru.po
	debian/po/sv.po
	debian/po/templates.pot
	debian/po/tr.po
	mysql-test/extra/binlog_tests/binlog.test
	mysql-test/include/mtr_check.sql
	mysql-test/r/innodb_load_xa_with_wsrep.result
	mysql-test/r/mysqld--help.result
	mysql-test/suite/binlog/r/binlog_row_binlog.result
	mysql-test/suite/binlog/r/binlog_stm_binlog.result
	mysql-test/suite/galera/galera_2nodes.cnf
	mysql-test/suite/galera/r/create.result
	mysql-test/suite/galera/t/create.test
	mysql-test/suite/perfschema/r/all_instances.result
	mysql-test/suite/perfschema/r/dml_setup_instruments.result
	mysql-test/suite/wsrep/r/variables.result
	mysql-test/suite/wsrep/t/variables.test
	mysql-test/t/mysqld--help.test
	mysys/default.c
	mysys/thr_lock.c
	scripts/CMakeLists.txt
	scripts/mysqld_safe.sh
	scripts/wsrep_sst_common.sh
	scripts/wsrep_sst_mysqldump.sh
	scripts/wsrep_sst_rsync.sh
	scripts/wsrep_sst_xtrabackup-v2.sh
	sql/event_data_objects.cc
	sql/events.cc
	sql/ha_partition.h
	sql/handler.cc
	sql/handler.h
	sql/lock.cc
	sql/log.cc
	sql/log.h
	sql/log_event.cc
	sql/mdl.cc
	sql/mysqld.cc
	sql/mysqld.h
	sql/rpl_record.cc
	sql/slave.cc
	sql/sp.cc
	sql/sql_acl.cc
	sql/sql_admin.cc
	sql/sql_alter.cc
	sql/sql_base.cc
	sql/sql_class.cc
	sql/sql_class.h
	sql/sql_connect.cc
	sql/sql_insert.cc
	sql/sql_parse.cc
	sql/sql_partition_admin.cc
	sql/sql_prepare.cc
	sql/sql_repl.cc
	sql/sql_show.cc
	sql/sql_table.cc
	sql/sql_trigger.cc
	sql/sys_vars.cc
	sql/transaction.cc
	sql/wsrep_applier.cc
	sql/wsrep_binlog.cc
	sql/wsrep_binlog.h
	sql/wsrep_hton.cc
	sql/wsrep_mysqld.cc
	sql/wsrep_mysqld.h
	sql/wsrep_priv.h
	sql/wsrep_sst.cc
	sql/wsrep_sst.h
	sql/wsrep_thd.cc
	sql/wsrep_thd.h
	sql/wsrep_utils.cc
	sql/wsrep_var.cc
	storage/innobase/dict/dict0dict.c
	storage/innobase/fil/fil0fil.c
	storage/innobase/handler/ha_innodb.cc
	storage/innobase/handler/ha_innodb.h
	storage/innobase/handler/handler0alter.cc
	storage/innobase/include/lock0lock.h
	storage/innobase/include/srv0srv.h
	storage/innobase/include/trx0sys.h
	storage/innobase/include/trx0trx.h
	storage/innobase/lock/lock0lock.c
	storage/innobase/os/os0file.c
	storage/innobase/rem/rem0rec.c
	storage/innobase/row/row0ins.c
	storage/innobase/row/row0upd.c
	storage/innobase/srv/srv0srv.c
	storage/innobase/trx/trx0roll.c
	storage/innobase/trx/trx0sys.c
	storage/innobase/trx/trx0trx.c
	storage/innobase/ut/ut0ut.c
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0buf.c
	storage/xtradb/dict/dict0dict.c
	storage/xtradb/handler/ha_innodb.cc
	storage/xtradb/handler/ha_innodb.h
	storage/xtradb/handler/handler0alter.cc
	storage/xtradb/include/lock0lock.h
	storage/xtradb/include/srv0srv.h
	storage/xtradb/include/trx0sys.h
	storage/xtradb/lock/lock0lock.c
	storage/xtradb/os/os0file.c
	storage/xtradb/os/os0proc.c
	storage/xtradb/rem/rem0rec.c
	storage/xtradb/row/row0ins.c
	storage/xtradb/row/row0upd.c
	storage/xtradb/srv/srv0srv.c
	storage/xtradb/srv/srv0start.c
	storage/xtradb/trx/trx0roll.c
	storage/xtradb/trx/trx0sys.c
	storage/xtradb/trx/trx0trx.c
	support-files/mysql.server.sh
	support-files/mysql.spec.sh
	wsrep/CMakeLists.txt