Marko Mäkelä 33215edcba Resolve conflicts in wsrep.variables ...

This was forgotten in the merge 0f83c8878d
because the test is disabled.

2019-07-24 15:30:27 +03:00

..

alter_table_innodb.result

MDEV-7374 : Losing connection to MySQL while running ALTER TABLE

2015-01-24 18:46:48 -05:00

binlog_format.result

Merge 10.1 into 10.2

2017-04-28 12:22:32 +03:00

foreign_key.result

Add test case for

2014-07-04 11:59:09 +03:00

mdev_6832.result

MDEV-6832: ER_LOCK_WAIT_TIMEOUT on SHOW STATUS

2014-12-31 19:46:48 -05:00

mdev_7798.result

Merge branch '10.0-galera' into 10.1

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

mdev_10186.result

MDEV-19736: Galera test failure on

2019-06-12 08:24:30 +03:00

mysql_tzinfo_to_sql_symlink.result

Merge 10.0-galera into 10.1

2015-02-06 16:14:23 +01:00

plugin.result

MDEV-7604: wsrep plugin lists its plugin_maturity as Unknown

2015-02-18 15:23:37 +02:00

pool_of_threads.result

MDEV-6247: Merge 10.0-galera to 10.1.

2014-08-26 15:43:46 +03:00

trans.result

MDEV-6247: Merge 10.0-galera to 10.1.

2014-08-26 15:43:46 +03:00

variables.result

Resolve conflicts in wsrep.variables

2019-07-24 15:30:27 +03:00

wsrep_rpl.result

Merge 10.1 into 10.2

2017-04-28 12:22:32 +03:00

wsrep-recover-v25,binlogon.rdiff

MDEV-15740 Recorded wsrep-recover-v25

2019-01-27 15:44:35 +02:00

wsrep-recover-v25.result

MDEV-15740 Recorded wsrep-recover-v25

2019-01-27 15:44:35 +02:00