mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00

Files

Sergei Petrunia e709eb9bf7 Merge branch '10.2' into 10.3

# Conflicts:
#	mysql-test/suite/galera/r/MW-388.result
#	mysql-test/suite/galera/t/MW-388.test
#	mysql-test/suite/innodb/r/truncate_inject.result
#	mysql-test/suite/innodb/t/truncate_inject.test
#	mysql-test/suite/rpl/r/rpl_stop_slave.result
#	mysql-test/suite/rpl/t/rpl_stop_slave.test
#	sql/sp_head.cc
#	sql/sp_head.h
#	sql/sql_lex.cc
#	sql/sql_yacc.yy
#	storage/xtradb/buf/buf0dblwr.cc

2020-01-17 00:46:40 +03:00

include

Merge branch '10.1' into 10.2

2018-09-14 08:47:22 +02:00

Merge 10.2 into 10.3

2020-01-07 12:14:35 +02:00

Merge branch '10.2' into 10.3

2020-01-17 00:46:40 +03:00

disabled.def

MDEV-21498 : wsrep.binlog_format test failed on Azure

2020-01-16 08:46:45 +02:00

my.cnf

MDEV-21335 : Galera test failure on suite wsrep

2019-12-18 10:02:57 +02:00

README

Minor modifications

2014-10-04 13:53:33 -04:00

suite.pm

MDEV-18565: Galera mtr-suite fails if galera library is not installed

2019-07-17 12:54:12 +02:00

README

* 'wsrep' suite is designated for tests which do not require a multi-node
  galera cluster.

* As these tests are specific to wsrep-related functionalities, they must skip
  on server built without wsrep patch (vanilla). (-DWITH_WSREP=OFF)
  See : include/have_wsrep.inc, include/have_wsrep_enabled.inc, not_wsrep.inc