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

Conflicts:
	storage/innobase/dict/dict0dict.c
	storage/xtradb/dict/dict0dict.c

Analysis: after a red-black-tree lookup we use node withouth
checking did lookup succeed or not. This lead to situation
where NULL-pointer was used.

Fix: Add additional check that found node from red-back-tree
is valid.

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

Enable execution of CREATE TABLE SELECT in total order isolation. Added
a test case.

Contributed by : Andrew W Elble

OPTION_SKIP_REPLICATION flag needs to be preserved for events received
on non-originating nodes.

log-tc-size is 24K by default. Page size is 64K on PPC64. But log-tc-
size
must be at least 3 x page size. This is enforced by TC_LOG_MMAP::open()
with a comment: to guarantee non-empty pool.

This all makes server not startable in default configuration on PPC64.

Autosize log-tc-size, so that it's min value= page size * 3, default
value= page size * 6, block size= page size.

Conflicts:
	mysql-test/suite/sys_vars/inc/sysvars_server.inc
	mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
	mysql-test/t/mysqld--help.test
	sql/mysqld.cc
	sql/sys_vars.cc

Annotate_rows event needs to be preserved until the last Rows event has
been applied because after it has been applied thd->query points to the
query stored inside this event.

Added an include file to check galera library version.

* Changed loopback detection to be done via ifa->ifa_flags
* Removed unused function wsrep_guess_address()

Conflicts:
	storage/innobase/include/trx0trx.h

Add a testcase. The bug itself was fixed by the fix for MDEV-7316.

* Changed loopback detection to be done via ifa->ifa_flags
* Removed unused function wsrep_guess_address()

partially cherry-pick from mysql/5.6.
No test case (mysql/5.6 test case is useless, the correct
test case uses too much memory)

commit e061985813db54948f99892d89f7e076242473a5
Author:  <Dao-Gang.Qu@sun.com>
Date:   Tue Jun 1 15:02:22 2010 +0800

    Bug #49931          Incorrect type in read_log_event error
    Bug #49932          mysqlbinlog max_allowed_packet hard coded to 1GB

If somehow the COMMIT or XID event in an event group was missing, the code in
parallel replication to handle this was not sufficient, leading to server
deadlock.

InnoDB transaction lock printout.

MDEV-7458: Deadlock in parallel replication can allow following transaction to start replicating too early

In parallel replication, don't rollback inside ha_commit_trans() in case of
error.

The rollback will be done later, but the parallel replication code needs to
run unmark_start_commit() before the rollback to properly control the
sequencing of transactions.

I did not manage to come up with a reliable automatic test case for this, but
I tested it manually.

(Without this, it happened for me that realpath() failed returning
undef for the default vardir. This in turn caused mysql-test-run.pl to
delete the source mysql-test/ directory.)

Backport from 10.1, it's not nice to get one's source directory nuked
by a rouge mysql-test-run.

waits and total wait time.

  Handle longjmp's raised during json processing.
modified:
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/json.cpp
  storage/connect/jsonudf.cpp

- Fix wrong references to the suppressed g->Trace variables.
modified:
  storage/connect/global.h
  storage/connect/plugutil.c
  storage/connect/tabjson.cpp
  storage/connect/tabodbc.cpp

Don't binlog mariadb setup sql statements:
* use "mysql_install_db --disable-log-bin"
* use "mysqld --bootstrap --disable-log-bin"
* use "SET sql_log_bin=0"

don't return from DROP TRIGGER IF NOT EXISTS on the slave side
early when the trigger couldn't be read

cherry-pick the upstream fix

commit d4ba10184cd7bde9c31c610e664ecd0c93605c46
Author: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
Date:   Wed Jul 2 11:34:11 2014 +0530

    Bug#17453826:ASSERTION ERROR WHEN SETTING FUTURE BINLOG
    FILE/POS WITH SEMISYNC

    Problem:
    ========
    When DMLs are in progress on the master stopping a slave and
    setting ahead binlog name/pos will cause an assert on the
    master.
    ...

Item_func::print() prints itself as name + "(" + arguments + ")".
Normally that works, but Item_func_interval internally implements its
arguments as one single Item_row. Item_row prints itself as
"(" + values + ")". As a result, "INTERVAL(1,2)" was being printed
as "INTERVAL((1,2))". Fixed with a custom Item_func_interval::print().

Removed 'galera-sst-mode' option from mysqldump and added logic
in wsrep_sst_mysqldump script to retrieve gtid_binlog_state from
donor node and send it to the joiner node.

Removed 'galera-sst-mode' option from mysqldump as its no longer needed.