Kristian Nielsen 167332597f Merge 10.0 -> 10.1. ...

Conflicts:
	mysql-test/suite/multi_source/multisource.result
	sql/sql_base.cc

2015-04-17 15:18:44 +02:00

..

gtid_ignore_duplicates.cnf

MDEV-5804: If same GTID is received on multiple master connections in multi-source replication, the event is double-executed causing corruption or replication failure

2014-03-09 10:27:38 +01:00

gtid_ignore_duplicates.result

MDEV-6255 DUPLICATE KEY Errors on SELECT .. GROUP BY that uses temporary and filesort.

2014-09-11 22:42:35 +03:00

gtid_ignore_duplicates.test

MDEV-6255 DUPLICATE KEY Errors on SELECT .. GROUP BY that uses temporary and filesort.

2014-09-11 22:42:35 +03:00

gtid.cnf

MDEV-26: Global Transaction ID.

2013-02-27 18:38:42 +01:00

gtid.result

MDEV-7037: MariaDB 10.0 does not build on Debian / kfreebsd-i386/amd64 due to MTR failure: multi_source.gtid

2014-11-27 09:34:41 +01:00

gtid.test

MDEV-7037: MariaDB 10.0 does not build on Debian / kfreebsd-i386/amd64 due to MTR failure: multi_source.gtid

2014-11-27 09:34:41 +01:00

info_logs-master.opt

MDEV-5277 - Ensure that all MySQL 5.6 options are supported by the

2013-11-25 18:49:40 +04:00

info_logs.result

MDEV-6676: Optimistic parallel replication

2015-02-07 09:42:58 +01:00

info_logs.test

MDEV-4394 Part IIa (missing wait condition for IO thread status in info_logs)

2013-04-15 04:13:26 +04:00

load_data.result

MDEV-6255 DUPLICATE KEY Errors on SELECT .. GROUP BY that uses temporary and filesort.

2014-09-11 22:42:35 +03:00

load_data.test

MDEV-6255 DUPLICATE KEY Errors on SELECT .. GROUP BY that uses temporary and filesort.

2014-09-11 22:42:35 +03:00

multisource.result

MDEV-7107 Sporadic test failure in multi_source.multisource

2015-03-09 15:42:26 +02:00

multisource.test

MDEV-7107 Sporadic test failure in multi_source.multisource

2015-03-09 15:42:26 +02:00

my.cnf

Fixed issues found by QA (Elena)

2012-09-28 21:22:24 +03:00

relaylog_events.result

MDEV-4475: Replication from MariaDB 10.0 to 5.5 does not work

2013-05-24 22:21:08 +02:00

relaylog_events.test

Fixed MDEV-4394 Sporadic failures in multi_source tests

2013-04-14 18:30:05 +03:00

reset_master_slave.inc

Merge 10.0-base -> 10.0

2013-05-28 15:39:56 +02:00

reset_slave.result

MDEV-6676: Optimistic parallel replication

2015-02-07 09:42:58 +01:00

reset_slave.test

Fixed MDEV-4394 Sporadic failures in multi_source tests

2013-04-14 18:30:05 +03:00

simple.result

MDEV-6676: Optimistic parallel replication

2015-02-07 09:42:58 +01:00

simple.test

MDEV-7074 multi_source.simple test fails in buildbot

2014-11-19 14:34:49 +04:00

skip_counter.result

Fixed test case as gtid events are not counted anymore

2014-02-11 18:45:49 +02:00

skip_counter.test

Fixed test case as gtid events are not counted anymore

2014-02-11 18:45:49 +02:00

status_vars.result

More tests and test cleanup for MDEV-253 (Multi-source replication)

2012-10-04 08:02:13 +04:00

status_vars.test

Fixed MDEV-4394 Sporadic failures in multi_source tests

2013-04-14 18:30:05 +03:00

syntax.result

MDEV-6676: Optimistic parallel replication

2014-12-06 08:49:50 +01:00

syntax.test

MDEV-4865 Change related to --log option/variable was merged partially

2013-08-13 13:35:36 +02:00

wait_for_sql_thread_read_all.inc

Extra check for synchronization in the multi-source replication test

2012-10-05 00:36:17 +04:00