Used mysql_real_data_home as wsrep_data_home_dir's default.
Added a test case.

Fixed by using hostname (glob_hostname) as default value for
wsrep_node_name system variable.
Added a test case.

DELETE FROM ports WHERE ports.id = 'f37aa3fe-ab99-4d0f-a566-6cd3169d7516'
where table ports have foreign keys.

Verified that current 5.5-galera is not affected and added test case
to regression set.

Do not initialize/load wsrep subsystem if server is
started in help mode.

During THD initialization, the value of wsrep_causal_reads (now
being exclusively handled via wsrep_sync_wait, lp:1277053) was
being ignored. Fixed by updating wsrep_sync_wait appropriately.

Also made some coding style related changes.

bzr merge -r4264 maria/5.5

Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.

for galera vs =2

Updated innodb_flush_log_at_trx_commit value in cnfs as per
recommendation.

disable tokudb paranoid asserts

Fix the bug properly (plugin cannot be unloaded as long as it's locked).
Enable and fix the test case.
Significantly reduce number of LOCK_plugin locks for semisync
(practically all locks were removed)

~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles

mysql_derived_prepare() was executed on the statement memory.
Now it is executed on the runtime memory.
All bugs induced by this were fixed.

Fix for MDEV-6493: Assertion `table->file->stats.records > 0 || error' failure, or 'Invalid write' valgrind warnings, or crash on scenario with Aria table, view, LOCK TABLES

This bug only happens in case of paritioned tables used in LOCK TABLES and implicit_commit() was called
(as part of trying to execute a CREATE TABLE withing lock tables)

The problem was that Aria could not move the tables from one transaction to the new one, as thd->open_tables contained
a partitioned tables and not an Aria table.

Fix:
- Store a list of all open tables that are part of a share in share->open_tables
- In maria::implict_commit() use transaction->used_tables & share->open_tables to find out which tables
  was part of the current transaction instead of using thd->open_tables, which may contain partitioned tables.


mysql-test/suite/maria/maria_partition.result:
  Added test case
mysql-test/suite/maria/maria_partition.test:
  Added test case
storage/maria/ha_maria.cc:
  Use trn->used tables and share->open_tables to find out which tables was part of the current transaction instead of using thd->open_tables.
storage/maria/ma_close.c:
  Remove closed table from share->open_list
storage/maria/ma_open.c:
  Add table to share->open_list
storage/maria/ma_state.c:
  Added comment
storage/maria/maria_def.h:
  Added share->open_list, a list of all tables that is using this share.

* remove incorrect assertion (it didn't take into account concurrent clients)
* fix the comment

Free the trx of the current thd (if any) in innobase_end()

MDEV-6302 Wrong result set when using GROUP BY FROM_UNIXTIME(...)+0
Fixed.

  
- adjusted a test result according to the change made for MDEV-6100;
- added explicit timezone for engines/iuds, since MTR in
  MariaDB does not set it like MySQL's, and tests with constant TIMESTAMP
  can have different outcome