maria:bb-10.2-mariarocks-merge-pre

Last commit made on 2018-09-01
Get this branch:
git clone -b bb-10.2-mariarocks-merge-pre https://git.launchpad.net/maria

Branch merges

Branch information

Name:
bb-10.2-mariarocks-merge-pre
Repository:
lp:maria

Recent commits

3157c19... by Sergey Petrunia

Trigger another BB run

c8a3c2b... by Jan Lindström

Disable failing Galera tests.

206528f... by Marko Mäkelä

Merge 10.1 into 10.2

f693170... by Marko Mäkelä

MDEV-16647 InnoDB fails to drop large temporary table on disconnect

This regression was introduced in MDEV-16515.
We would fail to drop a temporary table on client disconnect,
because trx_is_interrupted() would hold. To add insult to
injury, in MariaDB 10.1, InnoDB temporary tables are actually
persistent, so the garbage temporary tables will never be dropped.

row_drop_table_for_mysql(): If several iterations of
buf_LRU_drop_page_hash_for_tablespace() are needed,
do not interrupt dropping a temporary table even after
the transaction was marked as killed.

Server shutdown will still terminate the loop, and also DROP TABLE
of persistent tables will keep checking if the execution was aborted.

3b5d3cd... by Marko Mäkelä

Revert MDEV-9519 due to regressions

This reverts commit 75dfd4acb995789ca5f86ccbd361fff9d2797e79.

c933970... by Alexey Botchkov

MDEV-16665 ed25519 describes itself as 1.0-alpha even though it's not alpha.

Plugin version name fixed.

2ad51a0... by Alexey Botchkov

MDEV-17095 pam_user_map module throws syntax error if group name contains backslash.

Let '\\' and '/' symbols to be part of a group name.

b245023... by Igor Babaev

MDEV-16992 Assertion `table_ref->table || table_ref->view' failed in
           Field_iterator_table_ref::set_field_iterator

Several functions that processed different prepare statements missed
the DT_INIT flag in last parameter of the open_normal_and_derived_tables()
calls. It made context analysis of derived tables dependent on the order in
which the derived tables were processed by mysql_handle_derived(). This
order was induced by the order of SELECTs in all_select_list.
In 10.4 the order of SELECTs in all_select_list became different and lack
of the DT_INIT flags in some open_normal_and_derived_tables() call became
critical as some derived tables were not identified as such.

104089e... by Jan Lindström

MDEV-15512 - Fix sh parse error when [sst] config value has spaces.

Merged https://github.com/MariaDB/server/pull/617 authored by
Colin Mollenhour.

a8bf27c... by Ian Gilfillan <email address hidden>

MDEV-14927: Missing man pages