Kristian Nielsen df9b8aee58 Merge MDEV-8193 into 10.1 ...

Conflicts:
	sql/rpl_rli.cc

2015-09-11 12:01:48 +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-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

csv

…

encryption

MDEV-8708: InnoDB temp file encryption

2015-09-08 08:38:12 +03:00

engines

…

federated

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

funcs_1

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

funcs_2

…

galera

Update failing galera tests

2015-09-08 17:46:03 -04:00

galera_3nodes

Merge branch '10.0-galera' into 10.1

2015-07-14 16:05:29 -04:00

handler

…

heap

…

innodb

MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least one encrypted table exists and encryption service is not available

2015-09-04 20:19:33 +03:00

innodb_fts

…

innodb_zip

Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not specified and if not timestamp or auto_increment

2015-08-18 11:18:57 +03:00

jp

test failure

2015-09-04 16:30:11 +02:00

large_tests

…

maria

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

mtr/t

…

mtr2

…

multi_source

test cleanup: remove Format_description_log_event size dependency

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

ndb

Bug #18075170 SQL NODE RESTART REQUIRED TO

2015-05-11 16:05:50 +05:30

optimizer_unfixed_bugs

CRLF->LF

2015-06-02 22:07:47 +02:00

parts

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

percona

Merge tag 'mariadb-10.0.20' into 10.1

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

perfschema

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

perfschema_stress

…

plugins

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

roles

MDEV-6066: Merge new defaults from 5.6 and 5.7

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

rpl

Merge MDEV-8193 into 10.1

2015-09-11 12:01:48 +02:00

storage_engine

Follow-up for MDEV-6066 (new defaults from 5.6 and 5.7)

2015-09-06 21:01:59 +03:00

stress

Merge tag 'mariadb-10.0.20' into 10.1

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

sys_vars

disable encrypt_tmp_files and encrypt_binlog by default

2015-09-08 15:47:27 +02:00

unit

…

vcol

Merge branch '10.0' into 10.1

2015-09-03 12:58:41 +02:00

wsrep

Merge branch '10.0-galera' into 10.1

2015-09-03 16:32:00 +02:00