Sachin Setiya 5077cc0b1a Fix Merge Error

2017-08-23 16:49:42 +05:30

..

alter_table_innodb.opt

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

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

alter_table_innodb.test

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

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

binlog_format.opt

Test changes (backported from 10.1).

2015-01-16 13:53:23 -05:00

binlog_format.test

MDEV-10235: Deadlock in CREATE TABLE .. AS SELECT .. if result set is empty in Galera

2016-06-27 18:21:00 -04:00

foreign_key.opt

Test changes (backported from 10.1).

2015-01-16 13:53:23 -05:00

foreign_key.test

bzr merge -rtag:mariadb-10.0.15 maria/10.0

2014-12-05 12:33:02 -05:00

mdev_6832.opt

Fix Merge Error

2017-08-23 16:49:42 +05:30

mdev_6832.test

MDEV-6832: ER_LOCK_WAIT_TIMEOUT on SHOW STATUS

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

mdev_7798.opt

Fix Merge Error

2017-08-23 16:49:42 +05:30

mdev_7798.test

Merge branch '10.0-galera' into 10.1

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

mdev_10186.opt

MDEV-10186: mysqld crash when runtime setting wsrep_cluster_address without wsrep_on=ON

2016-06-27 18:15:47 -04:00

mdev_10186.test

MDEV-10993: wsrep.mdev_10186 result depends on location of galera library

2016-11-02 09:45:43 -04:00

mysql_tzinfo_to_sql_symlink.test

cleanup: galera misc cleanups

2014-10-10 22:27:36 +02:00

plugin.test

MDEV-7604: wsrep plugin lists its plugin_maturity as Unknown

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

pool_of_threads.opt

Test changes (backported from 10.1).

2015-01-16 13:53:23 -05:00

pool_of_threads.test

MDEV-6924 : Server crashed on CREATE TABLE ... SELECT

2014-11-17 11:56:03 -05:00

trans.test

MDEV-6247: Merge 10.0-galera to 10.1.

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

variables.test

Merge branch '10.0-galera' into bb-10.1-serg

2016-08-25 15:39:39 -04:00

wsrep_rpl.cnf

MDEV-10714: Could not execute Delete_rows event on table; wsrep_max_ws_rows exceeded. Error_Code 1180

2016-09-01 12:59:11 -04:00

wsrep_rpl.test

MW-313 Enforce wsrep_max_ws_rows also when binlog is enabled

2017-04-06 15:41:54 +05:30