Seppo Jaakola 496e22cf3b merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 ... and a number of fixes to make this buildable. Run also few short multi-master high conflict rate tests, with no issues		2013-12-04 10:32:43 +02:00
..
archive	MDEV-4786 - merge 10.0-monty - 10.0	2013-07-31 14:51:25 +04:00
blackhole
cassandra	simplify CMakeLists.txt for cassandra/connect engines	2013-09-25 19:32:14 +02:00
connect	MDEV-5241: Collation incompatibilities with MySQL-5.6	2013-11-09 00:20:07 +02:00
csv	10.0-monty merge	2013-07-21 16:39:19 +02:00
example	10.0-base merge.	2013-09-21 10:14:42 +02:00
federated	10.0-base merge.	2013-09-21 10:14:42 +02:00
federatedx	10.0-monty merge	2013-07-21 16:39:19 +02:00
heap	10.0-monty merge	2013-07-21 16:39:19 +02:00
innobase	merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6	2013-12-04 10:32:43 +02:00
maria	merge 10.0-base -> 10.0	2013-10-29 22:20:45 +02:00
myisam	10.0-base merge	2013-11-13 23:03:48 +01:00
myisammrg	Various changes coming from 5.6	2013-11-08 23:25:06 +04:00
ndb	mysql-5.5.32 merge	2013-07-16 19:09:54 +02:00
oqgraph	10.0-monty merge	2013-07-21 16:39:19 +02:00
perfschema	Merge 10.0-base -> 10.0	2013-10-15 10:26:08 +04:00
sequence	MDEV-4786 - merge 10.0-monty - 10.0	2013-07-24 16:51:48 +04:00
sphinx	Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.	2013-11-01 12:00:11 +01:00
spider	fix MEDV-4736 Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on UPDATE which violates constraint on a remote table	2013-09-30 05:11:44 +09:00
test_sql_discovery	MDEV-5260 discovery with sql is too restrictive	2013-11-10 17:51:01 +01:00
tokudb	10.0-base merge	2013-11-13 23:03:48 +01:00
xtradb	merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6	2013-12-04 10:32:43 +02:00