Monty b2f8d7b410 Merge branch '10.1' into 10.2 ...

Conflicts:
	VERSION
	cmake/plugin.cmake
	config.h.cmake
	configure.cmake
	plugin/server_audit/server_audit.c
	sql/sql_yacc.yy

2016-02-06 18:14:54 +02:00

..

archive

MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)

2015-09-04 10:33:56 +02:00

binlog

MDEV-8426 mysqlbinlog: "Corrupted replication event was detected.

2015-11-10 13:46:57 +02:00

csv

MDEV-8682 - CSV engine does not properly process "", in quotes

2015-09-28 12:04:26 +04:00

encryption

MDEV-9099: Test encryption.innodb_encryption_discard_import fails on buildbot

2015-11-17 09:46:40 +02:00

engines

Fixed engine test results in accordance with changes made in scope of

2015-11-06 17:52:57 +02:00

federated

Merge branch '10.0' into 10.1

2015-12-21 21:24:22 +01:00

funcs_1

Merge remote-tracking branch 'origin/10.1' into 10.2

2015-12-29 19:37:11 +04:00

funcs_2

…

galera

Merge branch 'github/10.0-galera' into 10.1

2015-12-22 10:32:33 +01:00

galera_3nodes

Merge branch 'github/10.0-galera' into 10.1

2015-11-19 17:48:36 +01:00

handler

…

heap

…

innodb

fix innodb-get-fk test

2015-12-21 21:24:53 +01:00

innodb_fts

MDEV-9118 ANALYZE TABLE for Engine independent status fetchs blob/text columns without use

2016-01-22 18:07:11 +01:00

innodb_zip

MDEV-9118 ANALYZE TABLE for Engine independent status fetchs blob/text columns without use

2016-01-22 18:07:11 +01:00

jp

Merge branch 'github/10.0-galera' into 10.1

2015-11-19 17:48:36 +01:00

large_tests

…

maria

Merge branch '10.1' into 10.2

2016-02-06 18:14:54 +02:00

mtr/t

…

mtr2

…

multi_source

test cleanup: remove Format_description_log_event size dependency

2015-09-04 10:33:53 +02:00

ndb

…

optimizer_unfixed_bugs

Merge branch '10.0' into 10.1

2015-12-21 21:24:22 +01:00

parts

MDEV-9118 ANALYZE TABLE for Engine independent status fetchs blob/text columns without use

2016-01-22 18:07:11 +01:00

percona

Merge tag 'mariadb-10.0.20' into 10.1

2015-06-27 20:35:26 +02:00

perfschema

Merge branch '10.0' into 10.1

2015-12-21 21:24:22 +01:00

perfschema_stress

…

plugins

Merge branch '10.0' into 10.1

2016-02-02 13:07:53 +02:00

roles

MDEV-8627: SHOW GRANTS does not work for a replicated role

2015-12-21 13:42:19 +02:00

rpl

Merge branch '10.0' into 10.1

2016-01-25 22:58:57 +01:00

storage_engine

Follow-up for MDEV-8675 and MDEV-8676

2015-09-14 03:12:54 +03:00

stress

Merge tag 'mariadb-10.0.20' into 10.1

2015-06-27 20:35:26 +02:00

sys_vars

Merge branch '10.1' into 10.2

2016-02-06 18:14:54 +02:00

unit

…

vcol

Merge branch '10.0' into 10.1

2015-12-21 21:24:22 +01:00

wsrep

Adjust warning suppression over a recent change in galera library.

2015-09-27 19:20:43 -04:00